projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Internal Debian 2.1.49-1
[yaz-moved-to-github.git]
/
zoom
/
zoom-benchmark.c
diff --git
a/zoom/zoom-benchmark.c
b/zoom/zoom-benchmark.c
index
3cd60c8
..
8e54c0a
100644
(file)
--- a/
zoom/zoom-benchmark.c
+++ b/
zoom/zoom-benchmark.c
@@
-1,5
+1,5
@@
/*
/*
- * $Id: zoom-benchmark.c,v 1.14 2006-09-18 09:40:05 marc Exp $
+ * $Id: zoom-benchmark.c,v 1.18 2007-01-04 14:44:34 marc Exp $
*
* Asynchronous multi-target client doing search and piggyback retrieval
*/
*
* Asynchronous multi-target client doing search and piggyback retrieval
*/
@@
-110,7
+110,7
@@
void print_events(int *elc, struct event_line_t *els,
-void init_statics()
+void init_statics(void)
{
int i;
char nullstring[1] = "";
{
int i;
char nullstring[1] = "";
@@
-193,7
+193,7
@@
long time_usec(struct time_type *ptime)
return ptime->usec;
}
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 "
{
fprintf(stderr, "zoom-benchmark: Call error\n");
fprintf(stderr, "zoom-benchmark -h host:port -q pqf-query "
@@
-276,7
+276,7
@@
void read_params(int argc, char **argv, struct parameters_t *p_parameters){
print_option_error();
}
print_option_error();
}
-void print_table_header()
+void print_table_header(void)
{
if (parameters.gnuplot)
printf("#");
{
if (parameters.gnuplot)
printf("#");
@@
-355,7
+355,7
@@
int main(int argc, char **argv)
const char *errmsg;
const char *addinfo;
int error = 0;
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;
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)
/* 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
else
+ //parameters.progress[i] = zoom_progress[event];
parameters.progress[i] += 1;
update_events(elc, els,
parameters.progress[i] += 1;
update_events(elc, els,