/*
- * $Id: zoom-benchmark.c,v 1.14 2006-09-18 09:40:05 marc 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
*/
-void init_statics()
+void init_statics(void)
{
int i;
char nullstring[1] = "";
return ptime->usec;
}
-void print_option_error()
+void print_option_error(void)
{
fprintf(stderr, "zoom-benchmark: Call error\n");
fprintf(stderr, "zoom-benchmark -h host:port -q pqf-query "
print_option_error();
}
-void print_table_header()
+void print_table_header(void)
{
if (parameters.gnuplot)
printf("#");
read_params(argc, argv, ¶meters);
- 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 */
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;
/* 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,