Skip to content

openvisualizer/motehandler/moteconnector/openparser/parserdata: fix #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fjmolinas wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

openvisualizer/motehandler/moteconnector/openparser/parserdata: fix #52

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f8e560
openvisualizer/motehandler/moteconnector/openparser/parserdata: fix
fjmolinas Oct 28, 2020
026dd8b
openvisualizer/motehandler/parserdata.py: add duty cycle
fjmolinas Nov 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 24 additions & 17 deletions openvisualizer/motehandler/moteconnector/openparser/parserdata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ def parse_input(self, data):
# cross layer trick here. capture UDP packet from udpLatency and get ASN to compute latency.
offset = 0
if len(data) > 37:
offset -= 7
if self.UINJECT_MASK == ''.join(chr(i) for i in data[offset:]):
offset -= 26
if self.UINJECT_MASK == ''.join(chr(i) for i in data[offset:offset + len(self.UINJECT_MASK)]):

pkt_info = \
{
Expand All @@ -114,31 +114,31 @@ def parse_input(self, data):
'numCellsUsedRx': 0,
'dutyCycle': 0,
}
offset += len(self.UINJECT_MASK)

pkt_info['counter'] = data[offset] + 256 * data[offset + 1] # counter sent by mote
offset += 2

offset -= 2
pkt_info['counter'] = data[offset - 2] + 256 * data[offset - 1] # counter sent by mote

pkt_info['asn'] = struct.unpack('<I', ''.join([chr(c) for c in data[offset - 5:offset - 1]]))[0]
aux = data[offset - 5:offset] # last 5 bytes of the packet are the ASN in the UDP latency packet
aux = data[offset:offset + 5] # last 5 bytes of the packet are the ASN in the UDP latency packet
diff = ParserData._asn_diference(aux, asn_bytes) # calculate difference
pkt_info['latency'] = diff # compute time in slots
offset -= 5
offset += 5

pkt_info['numCellsUsedTx'] = data[offset - 1]
offset -= 1
pkt_info['numCellsUsedTx'] = data[offset]
offset += 1

pkt_info['numCellsUsedRx'] = data[offset - 1]
offset -= 1
pkt_info['numCellsUsedRx'] = data[offset]
offset += 1

pkt_info['src_id'] = ''.join(['%02x' % x for x in [data[offset - 1], data[offset - 2]]]) # mote id
pkt_info['src_id'] = ''.join(['%02x' % x for x in [data[offset + 1], data[offset]]]) # mote id
src_id = pkt_info['src_id']
offset -= 2

num_ticks_on = struct.unpack('<I', ''.join([chr(c) for c in data[offset - 4:offset]]))[0]
offset -= 4
offset += 2

num_ticks_in_total = struct.unpack('<I', ''.join([chr(c) for c in data[offset - 4:offset]]))[0]
offset -= 4
num_ticks_on = struct.unpack('<I', ''.join([chr(c) for c in data[offset:offset + 4]]))[0]
offset += 4
num_ticks_in_total = struct.unpack('<I', ''.join([chr(c) for c in data[offset:]]))[0]

pkt_info['dutyCycle'] = float(num_ticks_on) / float(num_ticks_in_total) # duty cycle

Expand Down Expand Up @@ -208,6 +208,9 @@ def publish_kpi(self, src_id):
self.avg_kpi[src_id]['avg_latency'] = \
sum(self.avg_kpi[src_id]['latency']) / len(self.avg_kpi[src_id]['latency'])

self.avg_kpi[src_id]['avg_duty_cycle'] = \
sum(self.avg_kpi[src_id]['dutyCycle']) / len(self.avg_kpi[src_id]['dutyCycle'])

mote_data['counter'].sort() # sort the counter before calculating

self.avg_kpi[src_id]['avg_pdr'] = \
Expand All @@ -216,20 +219,24 @@ def publish_kpi(self, src_id):
avg_pdr_all = 0.0
avg_latency_all = 0.0
avg_num_cells_usage_all = 0.0
avg_duty_cycle_all = 0.0

for mote, data in self.avg_kpi.items():
avg_pdr_all += data['avg_pdr']
avg_latency_all += data['avg_latency']
avg_num_cells_usage_all += data['avg_cellsUsage']
avg_duty_cycle_all += data['avg_duty_cycle']

num_motes = len(self.avg_kpi)
avg_pdr_all = avg_pdr_all / float(num_motes)
avg_latency_all = avg_latency_all / float(num_motes)
avg_num_cells_usage_all = avg_num_cells_usage_all / float(num_motes)
avg_duty_cycle_all = avg_duty_cycle_all / float(num_motes)

payload['avg_cellsUsage'] = avg_num_cells_usage_all
payload['avg_latency'] = avg_latency_all
payload['avg_pdr'] = avg_pdr_all
payload['avg_duty_cycle'] = avg_duty_cycle_all
payload['src_id'] = src_id

if self.mqtt_connected:
Expand Down