X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=zoom%2Fzoom-benchmark.c;h=229f3cdd4f1da38f68eab83472cac6bfa5a34ac0;hp=6de24ab8bf2aa32a8fb9ea8c7581e4e37075ea5a;hb=49cb82c6f1a4a54272ee8ec1ec4331d59da3d190;hpb=8d691989077a0addcbd840d769dce6700f3d9622

diff --git a/zoom/zoom-benchmark.c b/zoom/zoom-benchmark.c
index 6de24ab..229f3cd 100644
--- a/zoom/zoom-benchmark.c
+++ b/zoom/zoom-benchmark.c
@@ -1,5 +1,5 @@
 /*
- * $Id: zoom-benchmark.c,v 1.16 2007-01-03 08:42:17 adam Exp $
+ * $Id: zoom-benchmark.c,v 1.20 2007-05-06 20:35:43 adam Exp $
  *
  * Asynchronous multi-target client doing search and piggyback retrieval
  */
@@ -300,11 +300,11 @@ int main(int argc, char **argv)
 
     read_params(argc, argv, &parameters);
 
-    z = xmalloc(sizeof(*z) * parameters.concurrent);
-    r = xmalloc(sizeof(*r) * parameters.concurrent);
-    elc = xmalloc(sizeof(*elc) * parameters.concurrent * parameters.repeat);
-    els = xmalloc(sizeof(*els) 
-                  * parameters.concurrent * parameters.repeat * 10);
+    z = (ZOOM_connection *) xmalloc(sizeof(*z) * parameters.concurrent);
+    r = (ZOOM_resultset *) xmalloc(sizeof(*r) * parameters.concurrent);
+    elc = (int *) xmalloc(sizeof(*elc) * parameters.concurrent * parameters.repeat);
+    els = (struct event_line_t *) xmalloc(
+        sizeof(*els) * parameters.concurrent * parameters.repeat * 10);
     o = ZOOM_options_create();
 
     /* async mode */
@@ -355,7 +355,7 @@ int main(int argc, char **argv)
             const char *errmsg;
             const char *addinfo;
             int error = 0;
-            int progress = zoom_progress[event];
+            //int progress = zoom_progress[event];
             
             if (event == ZOOM_EVENT_SEND_DATA || event == ZOOM_EVENT_RECV_DATA)
                 continue;
@@ -365,8 +365,12 @@ int main(int argc, char **argv)
             /* updating events and event list */
             error = ZOOM_connection_error(z[i-1] , &errmsg, &addinfo);
             if (error)
-                parameters.progress[i] = -progress;
+                parameters.progress[i] = zoom_progress[ZOOM_EVENT_UNKNOWN];
+            //parameters.progress[i] = zoom_progress[ZOOM_EVENT_NONE];
+            else if (event == ZOOM_EVENT_CONNECT)
+                parameters.progress[i] = zoom_progress[event];
             else
+                //parameters.progress[i] = zoom_progress[event];
                 parameters.progress[i] += 1;
             
             update_events(elc, els,