X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=examples%2Fomf%2Fvod_exp%2Fdemo_plot.py;fp=examples%2Fomf%2Fvod_exp%2Fdemo_plot.py;h=26ed22acfc08da65cad2396f459fb08528471696;hb=cb5d027b813a27d7de263653e1a8e0cef5490f0a;hp=5d16c9e1adc12248a2385a1b5c852b763d33aa5c;hpb=da6134f8a027890f2ee477a4658163d7d79127f1;p=nepi.git diff --git a/examples/omf/vod_exp/demo_plot.py b/examples/omf/vod_exp/demo_plot.py index 5d16c9e1..26ed22ac 100644 --- a/examples/omf/vod_exp/demo_plot.py +++ b/examples/omf/vod_exp/demo_plot.py @@ -95,21 +95,20 @@ def nb_client(s): def get_broad_values(list_files, type_file): for s in list_files: nb = nb_client(s) - o = open(s, 'r') - for l in o: - if 'udp' in l: - row = l.split(':') - f = row[1].split(' ') - frame = int(f[0]) - byte = int(row[2]) - - res = {} - res['frames'] = frame - res['bytes'] = byte - if frame < 20 : - continue - overall_stats_broad[nb][type_file].append(res) - o.close() + with open(s, 'r') as o: + for l in o: + if 'udp' in l: + row = l.split(':') + f = row[1].split(' ') + frame = int(f[0]) + byte = int(row[2]) + + res = {} + res['frames'] = frame + res['bytes'] = byte + if frame < 20 : + continue + overall_stats_broad[nb][type_file].append(res) get_broad_values(stats_broad_wlan, 'wlan') get_broad_values(stats_broad_eth, 'eth') @@ -146,21 +145,20 @@ for exp in data_vod_folders : def get_vod_values(list_files, type_file): for s in list_files: nb = nb_client(s) - o = open(s, 'r') - for l in o: - if 'udp' in l: - row = l.split(':') - f = row[1].split(' ') - frame = int(f[0]) - byte = int(row[2]) - - res = {} - res['frames'] = frame - res['bytes'] = byte - if frame < 100 : - continue - overall_stats_vod[nb][type_file].append(res) - o.close() + with open(s, 'r') as o: + for l in o: + if 'udp' in l: + row = l.split(':') + f = row[1].split(' ') + frame = int(f[0]) + byte = int(row[2]) + + res = {} + res['frames'] = frame + res['bytes'] = byte + if frame < 100 : + continue + overall_stats_vod[nb][type_file].append(res) get_vod_values(stats_vod_wlan, 'wlan') get_vod_values(stats_vod_eth, 'eth')