|
|
@@ -136,6 +136,8 @@ static struct option longopts[] = { |
|
|
|
{"retry-on-failure", no_argument, ¶m.retry_on_failure, 1}, |
|
|
|
{"runtime", required_argument, (int *) ¶m.runtime, 0}, |
|
|
|
{"send-buffer", required_argument, (int *) ¶m.send_buffer_size, 0}, |
|
|
|
{"server", required_argument, (int *) ¶m.server, 0}, |
|
|
|
{"server-name", required_argument, (int *) ¶m.server_name, 0}, |
|
|
|
{"servers", required_argument, (int *) ¶m.servers, 0}, |
|
|
|
{"uri", required_argument, (int *) ¶m.uri, 0}, |
|
|
|
{"session-cookies", no_argument, (int *) ¶m.session_cookies, 1}, |
|
|
@@ -175,9 +177,9 @@ usage(void) |
|
|
|
"\t[--num-calls N] [--num-conns N] [--session-cookies]\n" |
|
|
|
"\t[--period [d|u|e]T1[,T2]|[v]T1,D1[,T2,D2]...[,Tn,Dn]\n" |
|
|
|
"\t[--print-reply [header|body]] [--print-request [header|body]]\n" |
|
|
|
"\t[--rate X] [--recv-buffer N] [--retry-on-failure] " |
|
|
|
"[--send-buffer N]\n" |
|
|
|
"\t<--servers file> [--port N] [--uri S] [--myaddr S]\n" |
|
|
|
"\t[--rate X] [--recv-buffer N] [--retry-on-failure] [--send-buffer N]\n" |
|
|
|
"\t[--server S|--servers file] [--server-name S] [--port N] [--uri S] " |
|
|
|
"[--myaddr S]\n" |
|
|
|
#ifdef HAVE_SSL |
|
|
|
"\t[--ssl] [--ssl-ciphers L] [--ssl-no-reuse]\n" |
|
|
|
"\t[--ssl-certificate file] [--ssl-key file]\n" |
|
|
@@ -635,7 +637,11 @@ main(int argc, char **argv) |
|
|
|
prog_name, optarg); |
|
|
|
exit(1); |
|
|
|
} |
|
|
|
} else if (flag == ¶m.servers) |
|
|
|
} else if (flag == ¶m.server) |
|
|
|
param.server = optarg; |
|
|
|
else if (flag == ¶m.server_name) |
|
|
|
param.server_name = optarg; |
|
|
|
else if (flag == ¶m.servers) |
|
|
|
param.servers = optarg; |
|
|
|
#ifdef HAVE_SSL |
|
|
|
else if (flag == ¶m.ssl_cipher_list) |
|
|
@@ -974,13 +980,16 @@ main(int argc, char **argv) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if (param.servers == NULL) { |
|
|
|
if (param.server != NULL && param.servers != NULL) { |
|
|
|
fprintf(stderr, |
|
|
|
"%s: must specify --servers\n", |
|
|
|
"%s: --server S or --servers file\n", |
|
|
|
prog_name); |
|
|
|
exit(-1); |
|
|
|
} |
|
|
|
|
|
|
|
if (param.server == NULL && param.servers == NULL) |
|
|
|
param.server = "localhost"; |
|
|
|
|
|
|
|
#ifdef HAVE_SSL |
|
|
|
if (param.use_ssl) { |
|
|
|
char buf[1024]; |
|
|
@@ -1131,6 +1140,10 @@ main(int argc, char **argv) |
|
|
|
if (param.runtime > 0) |
|
|
|
printf(" --runtime=%g", param.runtime); |
|
|
|
printf(" --client=%u/%u", param.client.id, param.client.num_clients); |
|
|
|
if (param.server) |
|
|
|
printf(" --server=%s", param.server); |
|
|
|
if (param.server_name) |
|
|
|
printf(" --server_name=%s", param.server_name); |
|
|
|
if (param.servers) |
|
|
|
printf(" --servers=%s", param.servers); |
|
|
|
if (param.port) |
|
|
|