/*
- * $Id: zoom-benchmark.c,v 1.3 2005-09-11 13:32:39 adam Exp $
+ * $Id: zoom-benchmark.c,v 1.8 2005-09-16 10:51:05 adam Exp $
*
* Asynchronous multi-target client doing search and piggyback retrieval
*/
/* commando line parameters */
static struct parameters_t {
- char host[1024];
- char query[1024];
+ char host[4096];
+ char query[4096];
+ char progress[4096];
int concurrent;
int timeout;
} parameters;
zoom_progress[ZOOM_EVENT_RECV_SEARCH] = 6;
/* parameters */
- //parameters.host = "";
- //parameters.query = "";
+#if 0
+ parameters.host = "";
+ parameters.query = "";
+#endif
parameters.concurrent = 1;
parameters.timeout = 0;
+
+ /* progress initializing */
+ if (1)
+ {
+ int i;
+ for (i = 0; i < 4096; i++){
+ parameters.progress[i] = 0;
+ }
+ }
+
}
struct time_type
char *arg;
int ret;
while ((ret = options("h:q:c:t:", argv, argc, &arg)) != -2)
+ {
+ switch (ret)
{
- switch (ret)
- {
- case 'h':
- strcpy(p_parameters->host, arg);
+ case 'h':
+ strcpy(p_parameters->host, arg);
+ break;
+ case 'q':
+ strcpy(p_parameters->query, arg);
+ break;
+ case 'c':
+ p_parameters->concurrent = atoi(arg);
+ break;
+ case 't':
+ p_parameters->timeout = atoi(arg);
break;
- case 'q':
- strcpy(p_parameters->query, arg);
- break;
- case 'c':
- p_parameters->concurrent = atoi(arg);
- break;
- case 't':
- p_parameters->timeout = atoi(arg);
- break;
- case 0:
- //for (i = 0; i<number; i++)
- // yaz_log(level, "%s", arg);
- print_option_error();
- break;
- default:
- print_option_error();
- }
+ case 0:
+ print_option_error();
+ break;
+ default:
+ print_option_error();
}
-
- //printf("zoom-benchmark\n");
- //printf(" host: %s \n", p_parameters->host);
- //printf(" query: %s \n", p_parameters->query);
- //printf(" concurrent: %d \n", p_parameters->concurrent);
- //printf(" timeout: %d \n\n", p_parameters->timeout);
+ }
+
+#if 0
+ printf("zoom-benchmark\n");
+ printf(" host: %s \n", p_parameters->host);
+ printf(" query: %s \n", p_parameters->query);
+ printf(" concurrent: %d \n", p_parameters->concurrent);
+ printf(" timeout: %d \n\n", p_parameters->timeout);
+#endif
if (! strlen(p_parameters->host))
print_option_error();
int main(int argc, char **argv)
{
struct time_type time;
+ ZOOM_connection *z;
+ ZOOM_resultset *r;
+ ZOOM_options o;
+ int i;
init_statics();
read_params(argc, argv, ¶meters);
- ZOOM_connection z[parameters.concurrent];
- ZOOM_resultset r[parameters.concurrent];
- ZOOM_options o = ZOOM_options_create();
-
+ z = xmalloc(sizeof(*z) * parameters.concurrent);
+ r = xmalloc(sizeof(*r) * parameters.concurrent);
+ o = ZOOM_options_create();
/* async mode */
ZOOM_options_set (o, "async", "1");
ZOOM_options_set (o, "count", "1");
/* preferred record syntax */
- //ZOOM_options_set (o, "preferredRecordSyntax", "usmarc");
- //ZOOM_options_set (o, "elementSetName", "F");
+#if 0
+ ZOOM_options_set (o, "preferredRecordSyntax", "usmarc");
+ ZOOM_options_set (o, "elementSetName", "F");
+#endif
/* connect to all concurrent connections*/
- int i;
for ( i = 0; i < parameters.concurrent; i++){
/* create connection - pass options (they are the same for all) */
z[i] = ZOOM_connection_create(o);
/* connect and init */
- ZOOM_connection_connect(z[i], parameters.host, 0);
+ ZOOM_connection_connect(z[i], parameters.host, 0);
}
/* search all */
for (i = 0; i < parameters.concurrent; i++)
r[i] = ZOOM_connection_search_pqf (z[i], parameters.query);
- // print header of table
- printf ("second.usec\ttarget\tprogress\tevent\teventname\terror\terrorname\n");
+ /* print header of table */
+ 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 */
while ((i = ZOOM_event (parameters.concurrent, z)))
{
- time_stamp(&time);
-
int event = ZOOM_connection_last_event(z[i-1]);
const char *errmsg;
const char *addinfo;
int error = 0;
int progress = zoom_progress[event];
+ if (event == ZOOM_EVENT_SEND_DATA || event == ZOOM_EVENT_RECV_DATA)
+ continue;
+
+
+ time_stamp(&time);
error = ZOOM_connection_error(z[i-1] , &errmsg, &addinfo);
if (error)
- progress = -progress;
-
- printf ("%i.%06i\t%d\t%d\t%d\t%s\t%d\t%s\n",
- time_sec(&time), time_usec(&time),
- i-1, progress,
+ parameters.progress[i] = -progress;
+ else
+ parameters.progress[i] += 1;
+
+ 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);
}
- /* no more to be done. Inspect results */
- // commented out right now - do nothing
-/* for (i = 0; i<parameters.concurrent; i++) */
-/* { */
-/* int error; */
-/* const char *errmsg, *addinfo; */
-/* const char *tname = (same_target ? argv[2] : argv[1+i]); */
-/* /\* display errors if any *\/ */
-/* if ((error = ZOOM_connection_error(z[i], &errmsg, &addinfo))) */
-/* fprintf (stderr, "%s error: %s (%d) %s\n", tname, errmsg, */
-/* error, addinfo); */
-/* else */
-/* { */
-/* /\* OK, no major errors. Look at the result count *\/ */
-/* int pos; */
-/* printf ("%s: %d hits\n", tname, ZOOM_resultset_size(r[i])); */
-/* /\* go through all records at target *\/ */
-/* for (pos = 0; pos < 10; pos++) */
-/* { */
-/* int len; /\* length of buffer rec *\/ */
-/* const char *rec = */
-/* ZOOM_record_get ( */
-/* ZOOM_resultset_record (r[i], pos), "render", &len); */
-/* /\* if rec is non-null, we got a record for display *\/ */
-/* if (rec) */
-/* { */
-/* printf ("%d\n", pos+1); */
-/* if (rec) */
-/* fwrite (rec, 1, len, stdout); */
-/* printf ("\n"); */
-/* } */
-/* } */
-/* } */
-/* } */
-
/* destroy and exit */
for (i = 0; i<parameters.concurrent; i++)
{
ZOOM_resultset_destroy (r[i]);
ZOOM_connection_destroy (z[i]);
}
+ xfree(z);
+ xfree(r);
ZOOM_options_destroy(o);
exit (0);
}
projects / yaz-moved-to-github.git / blobdiff