kris/httperf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change --server to --servers.

Browse Source 
Prior to this commit --server took a list of servers, so making it
plural makes sense.
This commit is contained in:
Joseph Kong 2016-01-22 12:36:40 -08:00
parent df070fe2c3
commit 83fef49f59
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/conn.c
View File

@ -61,13 +61,13 @@ conn_add_servers(void)
struct stat st; struct stat st;
int fd, len; int fd, len;
fd = open(param.server, O_RDONLY, 0); fd = open(param.servers, O_RDONLY, 0);
if (fd == -1) if (fd == -1)
panic("%s: can't open %s\n", prog_name, param.server); panic("%s: can't open %s\n", prog_name, param.servers);
fstat(fd, &st); fstat(fd, &st);
if (st.st_size == 0) if (st.st_size == 0)
panic("%s: file %s is empty\n", prog_name, param.server); panic("%s: file %s is empty\n", prog_name, param.servers);
srvbase = (char *)mmap(0, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0); srvbase = (char *)mmap(0, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
if (srvbase == (char *)-1) if (srvbase == (char *)-1)

2
src/core.c
View File

@ -963,7 +963,7 @@ core_init(void)
printf("%s: maximum number of open descriptors = %ld\n", printf("%s: maximum number of open descriptors = %ld\n",
prog_name, rlimit.rlim_max); prog_name, rlimit.rlim_max);
if (param.server) if (param.servers)
conn_add_servers(); conn_add_servers();
if (param.runtime) { if (param.runtime) {
arg.l = 0; arg.l = 0;

16
src/httperf.c
View File

@ -136,7 +136,7 @@ static struct option longopts[] = {
{"retry-on-failure", no_argument, &param.retry_on_failure, 1}, {"retry-on-failure", no_argument, &param.retry_on_failure, 1},
{"runtime", required_argument, (int *) &param.runtime, 0}, {"runtime", required_argument, (int *) &param.runtime, 0},
{"send-buffer", required_argument, (int *) &param.send_buffer_size, 0}, {"send-buffer", required_argument, (int *) &param.send_buffer_size, 0},
{"server", required_argument, (int *) &param.server, 0}, {"servers", required_argument, (int *) &param.servers, 0},
{"uri", required_argument, (int *) &param.uri, 0}, {"uri", required_argument, (int *) &param.uri, 0},
{"session-cookies", no_argument, (int *) &param.session_cookies, 1}, {"session-cookies", no_argument, (int *) &param.session_cookies, 1},
#ifdef HAVE_SSL #ifdef HAVE_SSL
@ -177,7 +177,7 @@ usage(void)
"\t[--print-reply [header|body]] [--print-request [header|body]]\n" "\t[--print-reply [header|body]] [--print-request [header|body]]\n"
"\t[--rate X] [--recv-buffer N] [--retry-on-failure] " "\t[--rate X] [--recv-buffer N] [--retry-on-failure] "
"[--send-buffer N]\n" "[--send-buffer N]\n"
"\t<--server file> [--port N] [--uri S] [--myaddr S]\n" "\t<--servers file> [--port N] [--uri S] [--myaddr S]\n"
#ifdef HAVE_SSL #ifdef HAVE_SSL
"\t[--ssl] [--ssl-ciphers L] [--ssl-no-reuse]\n" "\t[--ssl] [--ssl-ciphers L] [--ssl-no-reuse]\n"
"\t[--ssl-certificate file] [--ssl-key file]\n" "\t[--ssl-certificate file] [--ssl-key file]\n"
@ -635,8 +635,8 @@ main(int argc, char **argv)
prog_name, optarg); prog_name, optarg);
exit(1); exit(1);
} }
} else if (flag == &param.server) } else if (flag == &param.servers)
param.server = optarg; param.servers = optarg;
#ifdef HAVE_SSL #ifdef HAVE_SSL
else if (flag == &param.ssl_cipher_list) else if (flag == &param.ssl_cipher_list)
param.ssl_cipher_list = optarg; param.ssl_cipher_list = optarg;
@ -974,9 +974,9 @@ main(int argc, char **argv)
} }
} }
if (param.server == NULL) { if (param.servers == NULL) {
fprintf(stderr, fprintf(stderr,
"%s: must specify --server\n", "%s: must specify --servers\n",
prog_name); prog_name);
exit(-1); exit(-1);
} }
@ -1131,8 +1131,8 @@ main(int argc, char **argv)
if (param.runtime > 0) if (param.runtime > 0)
printf(" --runtime=%g", param.runtime); printf(" --runtime=%g", param.runtime);
printf(" --client=%u/%u", param.client.id, param.client.num_clients); printf(" --client=%u/%u", param.client.id, param.client.num_clients);
if (param.server) if (param.servers)
printf(" --server=%s", param.server); printf(" --servers=%s", param.servers);
if (param.port) if (param.port)
printf(" --port=%d", param.port); printf(" --port=%d", param.port);
if (param.uri) if (param.uri)

4
src/httperf.h
View File

@ -91,7 +91,9 @@ Rate_Info;
typedef struct Cmdline_Params typedef struct Cmdline_Params
{ {
int http_version; /* (default) HTTP protocol version */ int http_version; /* (default) HTTP protocol version */
const char *server; const char *server; /* (default) hostname */
const char *server_name; /* fully qualified server name */
const char *servers;
int port; /* (default) server port */ int port; /* (default) server port */
const char *uri; /* (default) uri */ const char *uri; /* (default) uri */
const char *myaddr; const char *myaddr;