diff --git a/test/benchmark-list.h b/test/benchmark-list.h index b4d0d34fb..d90475e98 100644 --- a/test/benchmark-list.h +++ b/test/benchmark-list.h @@ -19,15 +19,13 @@ * IN THE SOFTWARE. */ -BENCHMARK_DECLARE (size_handle) -BENCHMARK_DECLARE (size_req) +BENCHMARK_DECLARE (sizes) BENCHMARK_DECLARE (ping_pongs) BENCHMARK_DECLARE (pump) HELPER_DECLARE (echo_server) TASK_LIST_START - BENCHMARK_ENTRY (size_handle) - BENCHMARK_ENTRY (size_req) + BENCHMARK_ENTRY (sizes) BENCHMARK_ENTRY (ping_pongs) BENCHMARK_HELPER (ping_pongs, echo_server) diff --git a/test/benchmark-ping-pongs.c b/test/benchmark-ping-pongs.c index a0557e896..c3307b270 100644 --- a/test/benchmark-ping-pongs.c +++ b/test/benchmark-ping-pongs.c @@ -84,7 +84,7 @@ static void pinger_close_cb(oio_handle_t* handle, int status) { ASSERT(status == 0); pinger = (pinger_t*)handle->data; - printf("%d pings\n", pinger->pongs); + printf("ping_pongs: %d pings\n", pinger->pongs); free(pinger); diff --git a/test/benchmark-sizes.c b/test/benchmark-sizes.c index b97912bb2..6d4d53863 100644 --- a/test/benchmark-sizes.c +++ b/test/benchmark-sizes.c @@ -22,13 +22,9 @@ #include "task.h" #include "../oio.h" -BENCHMARK_IMPL(size_handle) { - LOGF("%lu oio_handle_t\n", sizeof(oio_handle_t)); - return 0; -} - - -BENCHMARK_IMPL(size_req) { - LOGF("%lu oio_req_t\n", sizeof(oio_req_t)); + +BENCHMARK_IMPL(sizes) { + LOGF("oio_handle_t: %lu bytes\n", sizeof(oio_handle_t)); + LOGF("oio_req_t: %lu bytes\n", sizeof(oio_req_t)); return 0; } diff --git a/test/run-benchmarks.c b/test/run-benchmarks.c index bdf253cbb..c49de8c4c 100644 --- a/test/run-benchmarks.c +++ b/test/run-benchmarks.c @@ -56,4 +56,4 @@ int main(int argc, char **argv) { return 0; } -} \ No newline at end of file +} diff --git a/test/runner.c b/test/runner.c index f56f0aa23..f7caff798 100644 --- a/test/runner.c +++ b/test/runner.c @@ -152,7 +152,7 @@ finalize: break; default: - LOGF("%s: ", test->task_name); + //LOGF("%s: ", test->task_name); process_copy_output(main_process, fileno(stderr)); break; }