[netperf-dev] netperf2 commit notice r600 - trunk/doc/examples

[raj at netperf.org]

Author: raj
Date: 2012-06-25 18:19:01 -0700 (Mon, 25 Jun 2012)
New Revision: 600

Modified:
   trunk/doc/examples/post_proc.py
   trunk/doc/examples/runemomniaggdemo.sh
Log:
one cannot rely on a dict to enumerate in sorted order, and bitrates needed their multipler

Modified: trunk/doc/examples/post_proc.py
===================================================================
--- trunk/doc/examples/post_proc.py	2012-06-26 00:20:31 UTC (rev 599)
+++ trunk/doc/examples/post_proc.py	2012-06-26 01:19:01 UTC (rev 600)
@@ -224,11 +224,18 @@
     overall = prefix + "_overall"
     open_rrd(overall,start_time,end_time,1)
 
-    # this strikes me as being very brittle - can one really rely on
-    # dictionaries to iterate in order of the key when the key is an
-    # integer? for now I will assume so.
-    for key in ksink:
-        update_rrd(overall,ksink[key],key)
+    # one cannot rely on the enumeration of a dictionary being in key
+    # order and I do not know how to sort one, so we will simply walk
+    # the possible keys based on the start_time and end_time and if we
+    # find that key in the kitchen sink, we will use the value to
+    # update the overall rrd.
+    for key in xrange(int(start_time),int(end_time)+1):
+        if key in ksink:
+            try:
+                update_rrd(overall,ksink[key],key)
+                prevkey = key;
+            except:
+                print "Update failed for %d which was key %d previous %d" % (key, i,prevkey)
 
 def overall_min_max_avg(prefix,start_time,end_time,intervals):
 
@@ -356,8 +363,7 @@
     graph_overall(prefix,min_timestamp,end_time,vrules,peak_interval_id,peak_average)
     graph_individual(prefix,min_timestamp,end_time,vrules)
     
-    # we only need the units
-    units = units_et_al_by_prefix(prefix)[0]
-    print "Average of peak interval is %.3f %s from %d to %d" % (peak_average, units, intervals[peak_interval_id-1][0], intervals[peak_interval_id-1][1])
-    print "Minimum of peak interval is %.3f %s from %d to %d" % (peak_minimum, units, intervals[peak_interval_id-1][0], intervals[peak_interval_id-1][1])
-    print "Maximum of peak interval is %.3f %s from %d to %d" % (peak_maximum, units, intervals[peak_interval_id-1][0], intervals[peak_interval_id-1][1])
+    units, multiplier, direction = units_et_al_by_prefix(prefix)
+    print "Average of peak interval is %.3f %s from %d to %d" % (peak_average * float(multiplier), units, intervals[peak_interval_id-1][0], intervals[peak_interval_id-1][1])
+    print "Minimum of peak interval is %.3f %s from %d to %d" % (peak_minimum * float(multiplier), units, intervals[peak_interval_id-1][0], intervals[peak_interval_id-1][1])
+    print "Maximum of peak interval is %.3f %s from %d to %d" % (peak_maximum * float(multiplier), units, intervals[peak_interval_id-1][0], intervals[peak_interval_id-1][1])

Modified: trunk/doc/examples/runemomniaggdemo.sh
===================================================================
--- trunk/doc/examples/runemomniaggdemo.sh	2012-06-26 00:20:31 UTC (rev 599)
+++ trunk/doc/examples/runemomniaggdemo.sh	2012-06-26 01:19:01 UTC (rev 600)
@@ -99,13 +99,13 @@
 LENGTH="-l 7200"
 OUTPUT="-o all"
 
-DO_STREAM=0;
-DO_MAERTS=0;
+DO_STREAM=1;
+DO_MAERTS=1;
 # NOTE!  The Bidir test depends on being able to set a socket buffer
 # size greater than 13 * 64KB or 832 KB or there is a risk of the test
 # hanging.  If you are running linux, make certain that
 # net.core.[r|w]mem_max are sufficiently large
-DO_BIDIR=0;
+DO_BIDIR=1;
 DO_RRAGG=1;
 
 # TCP_RR for TPC/PPS using single-byte transactions and TCP_NODELAY