Skip to content

Fix tls_bench to measure with CLOCK_MONOTONIC, label MiB/s, guard zero-division #11176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dgarske wants to merge 1 commit into
base: master
Choose a base branch
from
+33 −9
Open

Fix tls_bench to measure with CLOCK_MONOTONIC, label MiB/s, guard zero-division #11176

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 33 additions & 9 deletions examples/benchmark/tls_bench.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,11 +440,24 @@ static int run_all_CAST(void)

static double gettime_secs(int reset)
{
#if defined(_POSIX_TIMERS) && (_POSIX_TIMERS > 0) && defined(CLOCK_MONOTONIC)
/* CLOCK_MONOTONIC is the correct source for measuring an interval: it is
* unaffected by NTP steps/slew and by manual clock changes, either of
* which can corrupt a run when using wall-clock time. It also has
* nanosecond resolution, where gettimeofday() quantises to 1 us - enough
* to matter for the short per-read/per-write intervals timed below. */
struct timespec ts;
LIBCALL_CHECK_RET(clock_gettime(CLOCK_MONOTONIC, &ts));
(void)reset;

return (double)ts.tv_sec + (double)ts.tv_nsec / 1000000000.0;
#else
struct timeval tv;
LIBCALL_CHECK_RET(gettimeofday(&tv, 0));
(void)reset;

return (double)tv.tv_sec + (double)tv.tv_usec / 1000000;
#endif
}


Expand Down Expand Up @@ -1744,15 +1757,26 @@ static THREAD_RETURN_NOJOIN WOLFSSL_THREAD_NO_JOIN server_thread(void* args)

static void print_stats(stats_t* wcStat, const char* desc, const char* cipher, const char *group, int verbose)
{
double rxRate, txRate, connAvg;

/* A run short enough to leave a timer or the connection count at zero
* would otherwise divide by zero and report inf/nan. */
rxRate = (wcStat->rxTime > 0.0) ?
wcStat->rxTotal / wcStat->rxTime / 1024 / 1024 : 0.0;
txRate = (wcStat->txTime > 0.0) ?
wcStat->txTotal / wcStat->txTime / 1024 / 1024 : 0.0;
connAvg = (wcStat->connCount > 0) ?
wcStat->connTime * 1000 / wcStat->connCount : 0.0;

if (verbose) {
fprintf(stderr,
"wolfSSL %s Benchmark on %s with group %s:\n"
"\tTotal : %9d bytes\n"
"\tNum Conns : %9d\n"
"\tRx Total : %9.3f ms\n"
"\tTx Total : %9.3f ms\n"
"\tRx : %9.3f MB/s\n"
"\tTx : %9.3f MB/s\n"
"\tRx : %9.3f MiB/s\n"
"\tTx : %9.3f MiB/s\n"
"\tConnect : %9.3f ms\n"
"\tConnect Avg : %9.3f ms\n",
desc,
Expand All @@ -1762,10 +1786,10 @@ static void print_stats(stats_t* wcStat, const char* desc, const char* cipher, c
wcStat->connCount,
wcStat->rxTime * 1000,
wcStat->txTime * 1000,
wcStat->rxTotal / wcStat->rxTime / 1024 / 1024,
wcStat->txTotal / wcStat->txTime / 1024 / 1024,
rxRate,
txRate,
wcStat->connTime * 1000,
wcStat->connTime * 1000 / wcStat->connCount);
connAvg);
}
else {
fprintf(stderr,
Expand All @@ -1778,10 +1802,10 @@ static void print_stats(stats_t* wcStat, const char* desc, const char* cipher, c
wcStat->connCount,
wcStat->rxTime * 1000,
wcStat->txTime * 1000,
wcStat->rxTotal / wcStat->rxTime / 1024 / 1024,
wcStat->txTotal / wcStat->txTime / 1024 / 1024,
rxRate,
txRate,
wcStat->connTime * 1000,
wcStat->connTime * 1000 / wcStat->connCount);
connAvg);
}
}

Expand Down Expand Up @@ -2321,7 +2345,7 @@ int bench_tls(void* args)
else {
fprintf(stderr, "%-6s %-33s %-25s %11s %9s %9s %9s %9s %9s %17s %15s\n",
"Side", "Cipher", "Group", "Total Bytes", "Num Conns", "Rx ms", "Tx ms",
"Rx MB/s", "Tx MB/s", "Connect Total ms", "Connect Avg ms");
"Rx MiB/s", "Tx MiB/s", "Connect Total ms", "Connect Avg ms");
#ifndef NO_WOLFSSL_SERVER
if (!argClientOnly) {
print_stats(&srv_comb, "Server", theadInfo[0].cipher, gname,
Expand Down
Loading