Skip to content

valkey-benchmark: fix non-interactive session output #2801

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
wants to merge 1 commit into
base: unstable
Choose a base branch
from
Open

valkey-benchmark: fix non-interactive session output #2801

Show file tree
Hide file tree
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
29 changes: 22 additions & 7 deletions src/valkey-benchmark.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ static struct config {
atomic_uint_fast64_t last_time_ns;
uint64_t time_per_token;
uint64_t time_per_burst;
int stdout_is_tty; /* cached isatty result */
} config;

/* Locations of the placeholders __rand_int__, __rand_1st__,
Expand Down Expand Up @@ -1107,7 +1108,9 @@ static void showReport(void) {
const float avg = hdr_mean(config.latency_histogram) / 1000.0f;

if (!config.quiet && !config.csv) {
printf("%*s\r", config.last_printed_bytes, " "); // ensure there is a clean line
if (config.stdout_is_tty) {
printf("%*s\r", config.last_printed_bytes, " "); // ensure there is a clean line
}
printf("====== %s ======\n", config.title);
printf(" %d requests completed in %.2f seconds\n", config.requests_finished, (float)config.totlatency / 1000);
printf(" %d parallel clients\n", config.numclients);
Expand Down Expand Up @@ -1186,7 +1189,9 @@ static void showReport(void) {
printf("\"%s\",\"%.2f\",\"%.3f\",\"%.3f\",\"%.3f\",\"%.3f\",\"%.3f\",\"%.3f\"\n", config.title, reqpersec, avg,
p0, p50, p95, p99, p100);
} else {
printf("%*s\r", config.last_printed_bytes, " "); // ensure there is a clean line
if (config.stdout_is_tty) {
printf("%*s\r", config.last_printed_bytes, " "); // ensure there is a clean line
}
printf("%s: %.2f requests per second, p50=%.3f msec\n", config.title, reqpersec, p50);
}
}
Expand Down Expand Up @@ -1976,7 +1981,11 @@ long long showThroughput(struct aeEventLoop *eventLoop, long long id, void *clie
return SHOW_THROUGHPUT_INTERVAL;
}
if (config.idlemode == 1) {
printf("clients: %d\r", config.liveclients);
if (config.stdout_is_tty) {
printf("clients: %d\r", config.liveclients);
} else {
printf("clients: %d\n", config.liveclients);
}
fflush(stdout);
return SHOW_THROUGHPUT_INTERVAL;
}
Expand All @@ -1991,11 +2000,16 @@ long long showThroughput(struct aeEventLoop *eventLoop, long long id, void *clie

config.previous_tick = current_tick;
atomic_store_explicit(&config.previous_requests_finished, requests_finished, memory_order_relaxed);
printf("%*s\r", config.last_printed_bytes, " "); /* ensure there is a clean line */
int printed_bytes =
printf("%s: rps=%.1f (overall: %.1f) avg_msec=%.3f (overall: %.3f)\r", config.title, instantaneous_rps, rps,
if (config.stdout_is_tty) {
printf("%*s\r", config.last_printed_bytes, " "); /* ensure there is a clean line */
int printed_bytes =
printf("%s: rps=%.1f (overall: %.1f) avg_msec=%.3f (overall: %.3f)\r", config.title, instantaneous_rps, rps,
hdr_mean(config.current_sec_latency_histogram) / 1000.0f, hdr_mean(config.latency_histogram) / 1000.0f);
config.last_printed_bytes = printed_bytes;
} else {
printf("%s: rps=%.1f (overall: %.1f) avg_msec=%.3f (overall: %.3f)\n", config.title, instantaneous_rps, rps,
hdr_mean(config.current_sec_latency_histogram) / 1000.0f, hdr_mean(config.latency_histogram) / 1000.0f);
config.last_printed_bytes = printed_bytes;
}
hdr_reset(config.current_sec_latency_histogram);
fflush(stdout);
return SHOW_THROUGHPUT_INTERVAL;
Expand Down Expand Up @@ -2105,6 +2119,7 @@ int main(int argc, char **argv) {
config.num_functions = 10;
config.num_keys_in_fcall = 1;
config.resp3 = 0;
config.stdout_is_tty = isatty(fileno(stdout));
resetPlaceholders();

i = parseOptions(argc, argv);
Expand Down
11 changes: 11 additions & 0 deletions tests/integration/valkey-benchmark.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,17 @@ tags {"benchmark network external:skip logreqres:skip"} {
r get key
} {arg}

test {benchmark: non-interactive output format} {
set cmd [valkeybenchmark $master_host $master_port "-t set -n 100000 -c 1"]
set output [exec {*}$cmd 2>/dev/null]
# In non-interactive mode, progress updates should be on separate lines
# Check that we have multiple lines with progress updates
set progress_lines [regexp -all -line {^SET: rps=} $output]
assert {$progress_lines > 1}
# Verify no carriage returns in the output
assert {[string first "\r" $output] == -1}
}

# tls specific tests
if {$::tls} {
test {benchmark: specific tls-ciphers} {
Expand Down
Loading