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

[raj at netperf.org]

Author: raj
Date: 2012-09-19 11:55:00 -0700 (Wed, 19 Sep 2012)
New Revision: 608

Modified:
   trunk/doc/examples/bloat.sh
   trunk/doc/examples/post_proc.py
Log:
allow suppression of individual results graphs and use vector rather than raster formats

Modified: trunk/doc/examples/bloat.sh
===================================================================
--- trunk/doc/examples/bloat.sh	2012-08-09 22:04:03 UTC (rev 607)
+++ trunk/doc/examples/bloat.sh	2012-09-19 18:55:00 UTC (rev 608)
@@ -103,7 +103,7 @@
 
 SCALE=`echo $MAXLATMAXBPS | awk '{print $2/$1}'`
 
-$RRDTOOL graph bloat.png --imgformat PNG \
+$RRDTOOL graph bloat.svg --imgformat SVG \
     $SIZE \
     --lower-limit 0 \
     --start $MIN_TIMESTAMP --end $MAX_TIMESTAMP \

Modified: trunk/doc/examples/post_proc.py
===================================================================
--- trunk/doc/examples/post_proc.py	2012-08-09 22:04:03 UTC (rev 607)
+++ trunk/doc/examples/post_proc.py	2012-09-19 18:55:00 UTC (rev 608)
@@ -245,7 +245,7 @@
         if key in ksink:
             try:
                 update_rrd(overall,ksink[key],key)
-                prevkey = key;
+                prevkey = key
             except Exception as e:
                 print "Update to %s failed for %d, previous %d %s" % (overall, key, prevkey, e)
 
@@ -327,10 +327,11 @@
                            'CDEF:intvl=bar,%s,*' % multiplier,
                            'LINE2:intvl#0F0F0F40:Interval average. Peak of %.3f during interval %d' % (peak_average, peak_interval_id) ]
 
-    rrdtool.graph(prefix + "_overall.png", '--imgformat', 'PNG',
+    rrdtool.graph(prefix + "_overall.svg", '--imgformat', 'SVG',
                   '--start', str(int(start_time)),
                   '--end', str(int(end_time)),
                   '-w','%d' % max(800,length),'-h','400',
+                  '--right-axis', '1:0',
                   vrules,
                   '--font', 'DEFAULT:0:Helvetica',
                   '-t', 'Overall %s' % prefix,
@@ -348,12 +349,13 @@
 
     for individual in glob.glob(prefix+"*.out"):
         basename = individual.strip(".out")
-        rrdtool.graph(basename + ".png",
-                      '--imgformat','PNG',
+        rrdtool.graph(basename + ".svg",
+                      '--imgformat','SVG',
                       '--start', str(int(start_time)),
                       '--end', str(int(end_time)),
                       '--font',  'DEFAULT:0:Helvetica',
                       '-w', '%d' % max(800,length), '-h', '400',
+                      '--right-axis', '1:0',
                       vrules,
                       '-t', '%s %s' % (basename,prefix),
                       '-v', '%s %s' % (direction, units),
@@ -383,7 +385,10 @@
     generate_overall(prefix,min_timestamp-2,end_time,ksink)
     peak_interval_id, peak_start, peak_end, peak_average, peak_minimum, peak_maximum = overall_min_max_avg(prefix,min_timestamp,end_time,intervals)
     graph_overall(prefix,min_timestamp,end_time,vrules,peak_interval_id,peak_average)
-    graph_individual(prefix,min_timestamp,end_time,vrules)
+    try:
+        no_individual = sys.argv[2]
+    except:
+        graph_individual(prefix,min_timestamp,end_time,vrules)
     
     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, peak_start, peak_end)