From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 19 Mar 2026 15:46:16 +0000 (+0100)
Subject: s4:torture/smb2: use ';' as field separator in bench.c progress output
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=07eeb0fbb11090b2c8b4e2cd39b10f982ee0835f;p=thirdparty%2Fsamba.git

s4:torture/smb2: use ';' as field separator in bench.c progress output

',' will be used as thousands separator in the next patch.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
---

diff --git a/source4/torture/smb2/bench.c b/source4/torture/smb2/bench.c
index 0db09d5aa9e..1ed7ddfb9fb 100644
--- a/source4/torture/smb2/bench.c
+++ b/source4/torture/smb2/bench.c
@@ -335,7 +335,7 @@ static void test_smb2_bench_echo_progress(struct tevent_context *ev,
 
 		torture_comment(state->tctx,
 				"%.2f second: "
-				"echo[num/s=%llu,avslat=%.6f,minlat=%.6f,maxlat=%.6f]      \r",
+				"echo[num/s=%llu;avslat=%.6f;minlat=%.6f;maxlat=%.6f]      \r",
 				timeval_elapsed(&state->starttime),
 				(unsigned long long)num_echos,
 				avs_echo_latency,
@@ -349,7 +349,7 @@ static void test_smb2_bench_echo_progress(struct tevent_context *ev,
 
 	torture_comment(state->tctx,
 			"%.2f second: "
-			"echo[num/s=%llu,avslat=%.6f,minlat=%.6f,maxlat=%.6f]\n",
+			"echo[num/s=%llu;avslat=%.6f;minlat=%.6f;maxlat=%.6f]\n",
 			timeval_elapsed(&state->starttime),
 			(unsigned long long)num_echos,
 			avs_echo_latency,
@@ -800,8 +800,8 @@ static void test_smb2_bench_path_contention_progress(struct tevent_context *ev,
 
 		torture_comment(state->tctx,
 				"%.2f second: "
-				"open[num/s=%llu,avslat=%.6f,minlat=%.6f,maxlat=%.6f] "
-				"close[num/s=%llu,avslat=%.6f,minlat=%.6f,maxlat=%.6f]     \r",
+				"open[num/s=%llu;avslat=%.6f;minlat=%.6f;maxlat=%.6f] "
+				"close[num/s=%llu;avslat=%.6f;minlat=%.6f;maxlat=%.6f]     \r",
 				timeval_elapsed(&state->starttime),
 				(unsigned long long)num_opens,
 				avs_open_latency,
@@ -821,8 +821,8 @@ static void test_smb2_bench_path_contention_progress(struct tevent_context *ev,
 
 	torture_comment(state->tctx,
 			"%.2f second: "
-			"open[num/s=%llu,avslat=%.6f,minlat=%.6f,maxlat=%.6f] "
-			"close[num/s=%llu,avslat=%.6f,minlat=%.6f,maxlat=%.6f]\n",
+			"open[num/s=%llu;avslat=%.6f;minlat=%.6f;maxlat=%.6f] "
+			"close[num/s=%llu;avslat=%.6f;minlat=%.6f;maxlat=%.6f]\n",
 			timeval_elapsed(&state->starttime),
 			(unsigned long long)num_opens,
 			avs_open_latency,
@@ -1199,7 +1199,7 @@ static void test_smb2_bench_read_progress(struct tevent_context *ev,
 
 		torture_comment(state->tctx,
 				"%.2f second: "
-				"read[num/s=%llu,bytes/s=%llu,avslat=%.6f,minlat=%.6f,maxlat=%.6f]      \r",
+				"read[num/s=%llu;bytes/s=%llu;avslat=%.6f;minlat=%.6f;maxlat=%.6f]      \r",
 				timeval_elapsed(&state->starttime),
 				(unsigned long long)num_reads,
 				(unsigned long long)num_reads*state->io_size,
@@ -1214,7 +1214,7 @@ static void test_smb2_bench_read_progress(struct tevent_context *ev,
 
 	torture_comment(state->tctx,
 			"%.2f second: "
-			"read[num/s=%llu,bytes/s=%llu,avslat=%.6f,minlat=%.6f,maxlat=%.6f]\n",
+			"read[num/s=%llu;bytes/s=%llu;avslat=%.6f;minlat=%.6f;maxlat=%.6f]\n",
 			timeval_elapsed(&state->starttime),
 			(unsigned long long)num_reads,
 			(unsigned long long)num_reads*state->io_size,
@@ -1624,7 +1624,7 @@ static void test_smb2_bench_write_progress(struct tevent_context *ev,
 
 		torture_comment(state->tctx,
 				"%.2f second: "
-				"write[num/s=%llu,bytes/s=%llu,avslat=%.6f,minlat=%.6f,maxlat=%.6f]      \r",
+				"write[num/s=%llu;bytes/s=%llu;avslat=%.6f;minlat=%.6f;maxlat=%.6f]      \r",
 				timeval_elapsed(&state->starttime),
 				(unsigned long long)num_writes,
 				(unsigned long long)num_writes*state->io_size,
@@ -1639,7 +1639,7 @@ static void test_smb2_bench_write_progress(struct tevent_context *ev,
 
 	torture_comment(state->tctx,
 			"%.2f second: "
-			"write[num/s=%llu,bytes/s=%llu,avslat=%.6f,minlat=%.6f,maxlat=%.6f]\n",
+			"write[num/s=%llu;bytes/s=%llu;avslat=%.6f;minlat=%.6f;maxlat=%.6f]\n",
 			timeval_elapsed(&state->starttime),
 			(unsigned long long)num_writes,
 			(unsigned long long)num_writes*state->io_size,