x/scalpels
Code Issues Proposed changes

parse device traffic like rpc

Browse Source 
Change-Id: Ifc2aa017b45f41052fecc80c49fd239b621e6aee
This commit is contained in:
Kun Huang 2015-10-29 16:21:39 +08:00
parent 698c248ca0
commit 9c188cc61a
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scalpels/agents/base.py
View File

@ -14,7 +14,7 @@ def run_agent(task_uuid, ag):
ag = subprocess.Popen(cmd.split())
return ag.pid
def parse_rpc(out):
def _parse_traffic(out, name):
"""
in:
ts, 123.00 pkts 2312 bytes
@ -29,7 +29,7 @@ def parse_rpc(out):
unit: bytes
data: [(ts, 2312.00), ...]
"""
ag_name = "Port Traffic"
ag_name = "%s Traffic" % name
pkts_ret = {"name": ag_name,
"unit": "pkts",
"data":[]}
@ -42,3 +42,9 @@ def parse_rpc(out):
bytes_ret["data"].append((ts, bytes))
return (pkts_ret, bytes_ret)
def parse_rpc(out):
return _parse_traffic(out, "Port")
def parse_traffic(out):
return _parse_traffic(out, "Device")

3
scripts/device-input-traffic.sh
View File

@ -13,8 +13,7 @@ while [ 1 -eq 1 ] ; do
sleep $interval
n_packages=`cat /sys/class/net/$dev/statistics/rx_packets `
n_bytes=`cat /sys/class/net/$dev/statistics/rx_bytes `
python -c "print '%0.2f pkt/s' % (float($n_packages-$packages)/int($interval))"
python -c "print '%0.2f byte/s' % (float($n_bytes-$bytes)/int($interval))"
python -c "print '%0.2f pkt/s %0.2f byte/s' % ((float($n_packages-$packages)/int($interval), (float($n_bytes-$bytes)/int($interval))))"
packages=$n_packages
bytes=$n_bytes
done