From 82b2905aa1afa66fc34dea6d9f43432de7128f1f Mon Sep 17 00:00:00 2001 From: shefty Date: Fri, 20 Jun 2008 04:31:26 +0000 Subject: [PATCH] perftest: update prints Signed-off-by: Sean Hefty git-svn-id: svn://openib.tc.cornell.edu/gen1@1291 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- branches/winverbs/tests/perftest/read_bw/read_bw.c | 2 ++ .../winverbs/tests/perftest/read_lat/read_lat.c | 14 ++++++++------ .../winverbs/tests/perftest/send_lat/send_lat.c | 2 ++ .../winverbs/tests/perftest/write_lat/write_lat.c | 2 ++ 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/branches/winverbs/tests/perftest/read_bw/read_bw.c b/branches/winverbs/tests/perftest/read_bw/read_bw.c index 2abfe94d..e8a35621 100644 --- a/branches/winverbs/tests/perftest/read_bw/read_bw.c +++ b/branches/winverbs/tests/perftest/read_bw/read_bw.c @@ -501,6 +501,8 @@ static void print_report(unsigned int iters, unsigned size, int duplex, tsize = duplex ? 2 : 1; tsize = tsize * size; + printf("%7d %d ", size, iters); + { double sec = (double) opt_delta / (double) cycles_to_units; double mbytes = (double) tsize / (double) 0x100000; diff --git a/branches/winverbs/tests/perftest/read_lat/read_lat.c b/branches/winverbs/tests/perftest/read_lat/read_lat.c index 36bc6c55..74cbe292 100644 --- a/branches/winverbs/tests/perftest/read_lat/read_lat.c +++ b/branches/winverbs/tests/perftest/read_lat/read_lat.c @@ -119,6 +119,8 @@ static struct ibv_device *pp_find_dev(const char *ib_devname) { struct ibv_device *ib_dev = NULL; dev_list = ibv_get_device_list(NULL); + if (!dev_list) + return NULL; if (!ib_devname) { ib_dev = dev_list[0]; @@ -617,22 +619,22 @@ static void print_report(struct report_options * options, if (options->unsorted) { printf("#, %s, frequency=%I64d\n", units, get_freq()); for (i = 0; i < iters - 1; ++i) - printf("%d, %g\n", i + 1, delta[i] / cycles_to_units / 2. * 1000000.); + printf("%d, %g\n", i + 1, delta[i] / cycles_to_units); } qsort(delta, iters - 1, sizeof *delta, cycles_compare); if (options->histogram) { - printf("#, %s\n", units); + printf("#, %s, frequency=%I64d\n", units, get_freq()); for (i = 0; i < iters - 1; ++i) - printf("%d, %7.2f\n", i + 1, (double) delta[i] / (double) cycles_to_units / 2. * 1000000.); + printf("%d, %7.2f\n", i + 1, (double) delta[i] / (double) cycles_to_units); } median = get_median(iters - 1, delta); printf("%7d %d %7.2f %7.2f %7.2f\n", - size, iters, (double) delta[0] / (double) cycles_to_units / 2. * 1000000., - (double) delta[iters - 2] / (double) cycles_to_units / 2. * 1000000., - (double) median / (double) cycles_to_units / 2. * 1000000.); + size, iters, (double) delta[0] / (double) cycles_to_units * 1000000., + (double) delta[iters - 2] / (double) cycles_to_units * 1000000., + (double) median / (double) cycles_to_units * 1000000.); free(delta); } diff --git a/branches/winverbs/tests/perftest/send_lat/send_lat.c b/branches/winverbs/tests/perftest/send_lat/send_lat.c index 0562a3f3..25fcbe39 100644 --- a/branches/winverbs/tests/perftest/send_lat/send_lat.c +++ b/branches/winverbs/tests/perftest/send_lat/send_lat.c @@ -130,6 +130,8 @@ static struct ibv_device *pp_find_dev(const char *ib_devname) { struct ibv_device *ib_dev = NULL; dev_list = ibv_get_device_list(NULL); + if (!dev_list) + return NULL; if (!ib_devname) { ib_dev = dev_list[0]; diff --git a/branches/winverbs/tests/perftest/write_lat/write_lat.c b/branches/winverbs/tests/perftest/write_lat/write_lat.c index d7553f0a..ddd73e3e 100644 --- a/branches/winverbs/tests/perftest/write_lat/write_lat.c +++ b/branches/winverbs/tests/perftest/write_lat/write_lat.c @@ -116,6 +116,8 @@ static struct ibv_device *pp_find_dev(const char *ib_devname) { struct ibv_device *ib_dev = NULL; dev_list = ibv_get_device_list(NULL); + if (!dev_list) + return NULL; if (!ib_devname) { ib_dev = dev_list[0]; -- 2.41.0