admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

iscsi-perf: add a logging parameter

Browse Source 
if specified the perf output will log the perf data once per second.

Signed-off-by: Peter Lieven <pl@kamp.de>
This commit is contained in:
Peter Lieven
2016-07-07 10:44:24 +02:00
parent 334ab850c0
commit 19a3412d58
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
utils/iscsi-perf.c
View File

@@ -47,6 +47,7 @@ int max_in_flight = 32;
int blocks_per_io = 8; int blocks_per_io = 8;
uint64_t runtime = 0; uint64_t runtime = 0;
uint64_t finished = 0; uint64_t finished = 0;
int logging = 0;
struct client { struct client {
int finished; int finished;
@@ -117,6 +118,9 @@ void progress(struct client *client) {
printf ("lba %" PRIu64 ", iops current %" PRIu64 " (%" PRIu64 " MB/s), ", client->pos, iops, mbps >> 20); printf ("lba %" PRIu64 ", iops current %" PRIu64 " (%" PRIu64 " MB/s), ", client->pos, iops, mbps >> 20);
printf ("iops average %" PRIu64 " (%" PRIu64 " MB/s), in_flight %d, busy %d ", aiops, ambps >> 20, client->in_flight, client->busy_cnt); printf ("iops average %" PRIu64 " (%" PRIu64 " MB/s), in_flight %d, busy %d ", aiops, ambps >> 20, client->in_flight, client->busy_cnt);
} }
if (logging) {
printf ("\n");
}
fflush(stdout); fflush(stdout);
client->last_ns = now; client->last_ns = now;
client->last_iops = client->iops; client->last_iops = client->iops;
@@ -220,7 +224,7 @@ void fill_read_queue(struct client *client)
} }
void usage(void) { void usage(void) {
fprintf(stderr,"Usage: iscsi-perf [-i <initiator-name>] [-m <max_requests>] [-b blocks_per_request] [-t timeout] [-r|--random] [-n|--ignore-errors] [-x <max_reconnects>] <LUN>\n"); fprintf(stderr,"Usage: iscsi-perf [-i <initiator-name>] [-m <max_requests>] [-b blocks_per_request] [-t timeout] [-r|--random] [-l|--logging] [-n|--ignore-errors] [-x <max_reconnects>] <LUN>\n");
exit(1); exit(1);
} }
@@ -254,6 +258,7 @@ int main(int argc, char *argv[])
{"runtime", required_argument, NULL, 't'}, {"runtime", required_argument, NULL, 't'},
{"random", no_argument, NULL, 'r'}, {"random", no_argument, NULL, 'r'},
{"random-blocks", no_argument, NULL, 'R'}, {"random-blocks", no_argument, NULL, 'R'},
{"logging", no_argument, NULL, 'l'},
{"ignore-errors", no_argument, NULL, 'n'}, {"ignore-errors", no_argument, NULL, 'n'},
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
@@ -266,7 +271,7 @@ int main(int argc, char *argv[])
printf("iscsi-perf version %s - (c) 2014-2015 by Peter Lieven <pl@ĸamp.de>\n\n", PERF_VERSION); printf("iscsi-perf version %s - (c) 2014-2015 by Peter Lieven <pl@ĸamp.de>\n\n", PERF_VERSION);
while ((c = getopt_long(argc, argv, "i:m:b:t:nrRx:", long_options, while ((c = getopt_long(argc, argv, "i:m:b:t:lnrRx:", long_options,
&option_index)) != -1) { &option_index)) != -1) {
switch (c) { switch (c) {
case 'i': case 'i':
@@ -290,6 +295,9 @@ int main(int argc, char *argv[])
case 'R': case 'R':
client.random_blocks = 1; client.random_blocks = 1;
break; break;
case 'l':
logging = 1;
break;
case 'x': case 'x':
client.max_reconnects = atoi(optarg); client.max_reconnects = atoi(optarg);
break; break;