Skip to content

Commit afbd2d6

Browse files
committed
man page entry
1 parent 85d0171 commit afbd2d6

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

src/iperf3.1

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,10 @@ output in JSON format
162162
.BR --json-stream " "
163163
output in line-delimited JSON format
164164
.TP
165+
.TP
166+
.BR --json-stream-full-output " "
167+
output in JSON format with JSON streams enabled
168+
.TP
165169
.BR --logfile " \fIfile\fR"
166170
send output to a log file.
167171
.TP

src/iperf_api.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3733,8 +3733,10 @@ iperf_print_intermediate(struct iperf_test *test)
37333733
* results around unless we're the server and the client requested the server output.
37343734
*
37353735
* This avoids unneeded memory build up for long sessions.
3736+
*
3737+
* The user can still opt in for all measurement data via the --json-stream-full-output option.
37363738
*/
3737-
discard_json = !test->json_stream_full_output && test->json_stream == 1 && !(test->role == 's' && test->get_server_output);
3739+
discard_json = test->json_stream == 1 && !test->json_stream_full_output && !(test->role == 's' && test->get_server_output);
37383740

37393741
if (test->json_output) {
37403742
json_interval = cJSON_CreateObject();

0 commit comments

Comments
 (0)