changed output such that process comes first, then time, then progress. added3D plots

diff --git a/zoom/zoom-benchmark.c b/zoom/zoom-benchmark.c
index ca6a5b4..a73800c 100644 (file)
--- a/zoom/zoom-benchmark.c
+++ b/zoom/zoom-benchmark.c
@@ -1,5 +1,5 @@
 /*
 /*

- * $Id: zoom-benchmark.c,v 1.5 2005-09-15 10:38:03 marc Exp $
+ * $Id: zoom-benchmark.c,v 1.6 2005-09-15 20:51:16 marc Exp $

  *
  * Asynchronous multi-target client doing search and piggyback retrieval
  */
  *
  * Asynchronous multi-target client doing search and piggyback retrieval
  */

@@ -204,7 +204,7 @@ int main(int argc, char **argv)
         r[i] = ZOOM_connection_search_pqf (z[i], parameters.query);
 
     // print header of table
         r[i] = ZOOM_connection_search_pqf (z[i], parameters.query);
 
     // print header of table

-    printf ("second.usec\ttarget\tprogress\tevent\teventname\t");
+    printf ("target\tsecond.usec\tprogress\tevent\teventname\t");

     printf("error\terrorname\n");
     time_init(&time);
     /* network I/O. pass number of connections and array of connections */
     printf("error\terrorname\n");
     time_init(&time);
     /* network I/O. pass number of connections and array of connections */

@@ -228,9 +228,9 @@ int main(int argc, char **argv)
         else
             parameters.progress[i] += 1;
 
         else
             parameters.progress[i] += 1;
 

-        printf ("%ld.%06ld\t%d\t%d\t%d\t%s\t%d\t%s\n",
-                time_sec(&time), time_usec(&time), 
-                i-1, parameters.progress[i],
+        printf ("%d\t%ld.%06ld\t%d\t%d\t%s\t%d\t%s\n",
+                i-1, time_sec(&time), time_usec(&time), 
+                parameters.progress[i],

                 event, zoom_events[event], 
                 error, errmsg);
 
                 event, zoom_events[event], 
                 error, errmsg);
 

diff --git a/zoom/zoom-benchmark.gpt b/zoom/zoom-benchmark.gpt
index cd8524f..3e8b9a9 100644 (file)
--- a/zoom/zoom-benchmark.gpt
+++ b/zoom/zoom-benchmark.gpt
@@ -1,31 +1,21 @@
 
 #
 
 #

-# $Id: zoom-benchmark.gpt,v 1.2 2005-09-15 11:14:22 marc Exp $
+# $Id: zoom-benchmark.gpt,v 1.3 2005-09-15 20:51:16 marc Exp $

 #
 
 set title "Z39.50 connection plot"
 #set style data fsteps
 #
 
 set title "Z39.50 connection plot"
 #set style data fsteps

-set xlabel "Time Seconds"
-set ylabel "Progress"
-#set timefmt "%d/%m/%y\t%H%M"
-set yrange [ -9 :  ]
-#set xdata time
-#set xrange [ "1/6/93":"1/11/93" ]
-#set ylabel "Concentration\nmg/l"
-#set format x "%d/%m\n%H:%M"
+set xlabel "Connection"
+set ylabel "Time Seconds"
+set zlabel "Progress"
+#set yrange [ 0 :  ]
+#set zrange [ -9 :  ]

 set grid
 set grid

+#set pm3d

 #set multiplot
 #set multiplot

-#set key left
-#plot 'out.txt' using 1:3 t '', \
-#     'out.txt' using 1:3 t 'Total P' with points, \
-#     'out.txt' using 1:4 t '', \
-#     'out.txt' using 1:4 t 'PO4' with points 

 
 

-#if ( $2 = 3 ) plot 'out.txt' using 1:3
-#plot 'out.txt' using ($1):($2==3 ? $3 : 1/0)
-#plot 'out.txt' using 1:3 t '' with points
-plot 'out.txt' using ($1):($3) t '' with points
-#plot 'out.txt' using ($1):($3) t '' with lines
+splot 'out.txt' using ($1):($2):($3) t '' with points
+#splot 'out.txt' using ($1):($3) t '' with lines

 pause -1 "Hit return to continue"
 
 
 pause -1 "Hit return to continue"