git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systematic use of context managers for dealing with files instead of open()/close...
[nepi.git]
/
examples
/
ccn_emu_live
/
dce.py
diff --git
a/examples/ccn_emu_live/dce.py
b/examples/ccn_emu_live/dce.py
index
7f490a4
..
4b51b17
100644
(file)
--- a/
examples/ccn_emu_live/dce.py
+++ b/
examples/ccn_emu_live/dce.py
@@
-17,6
+17,8
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
+from __future__ import print_function
+
from nepi.execution.ec import ExperimentController
from nepi.execution.runner import ExperimentRunner
from nepi.util.netgraph import NetGraph, TopologyType
from nepi.execution.ec import ExperimentController
from nepi.execution.runner import ExperimentRunner
from nepi.util.netgraph import NetGraph, TopologyType
@@
-166,10
+168,9
@@
def avg_interests(ec, run):
# TODO: DUMP RESULTS TO FILE
# TODO: DUMP GRAPH DELAYS!
# TODO: DUMP RESULTS TO FILE
# TODO: DUMP GRAPH DELAYS!
- f = open("/tmp/metric", "a+")
- f.write("%.2f\n" % metric)
- f.close()
- print " METRIC", metric
+ with open("/tmp/metric", "a+") as f:
+ f.write("%.2f\n" % metric)
+ print(" METRIC", metric)
return metric
return metric
@@
-211,7
+212,7
@@
if __name__ == '__main__':
add_node_callback = add_dce_node,
add_edge_callback = add_dce_edge)
add_node_callback = add_dce_node,
add_edge_callback = add_dce_edge)
- print
"Results stored at", ec.exp_dir
+ print
("Results stored at", ec.exp_dir)
#### Retrieve the consumer to wait for ot to finish
ccncat = ec.filter_resources("linux::ns3::dce::CCNCat")
#### Retrieve the consumer to wait for ot to finish
ccncat = ec.filter_resources("linux::ns3::dce::CCNCat")