Skip to content

Commit e28dc4e

Browse files
committed
smbtorture: fix regression in smb2.bench
The changes in b675737 caused a regression where only the first connection was used. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15934 Signed-off-by: Ralph Boehme <[email protected]> Reviewed-by: Stefan Metzmacher <[email protected]> Autobuild-User(master): Ralph Böhme <[email protected]> Autobuild-Date(master): Thu Oct 16 18:42:05 UTC 2025 on atb-devel-224
1 parent d1ea929 commit e28dc4e

File tree

1 file changed

+24
-40
lines changed

1 file changed

+24
-40
lines changed

source4/torture/smb2/bench.c

Lines changed: 24 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -445,17 +445,13 @@ static bool test_smb2_bench_echo(struct torture_context *tctx,
445445
}
446446
}
447447

448-
for (li = 0, i = 0; i <state->num_conns; i++) {
449-
size_t pcli;
448+
for (li = 0; li <state->num_loops; li++) {
449+
struct test_smb2_bench_echo_loop *loop = &state->loops[li];
450450

451-
for (pcli = 0; pcli < torture_qdepth; pcli++) {
452-
struct test_smb2_bench_echo_loop *loop = &state->loops[li];
453-
454-
tevent_schedule_immediate(loop->im,
455-
tctx->ev,
456-
test_smb2_bench_echo_loop_start,
457-
loop);
458-
}
451+
tevent_schedule_immediate(loop->im,
452+
tctx->ev,
453+
test_smb2_bench_echo_loop_start,
454+
loop);
459455
}
460456

461457
torture_comment(tctx, "Opened %zu connections with qdepth=%d => %zu loops\n",
@@ -927,17 +923,13 @@ bool test_smb2_bench_path_contention_shared(struct torture_context *tctx,
927923
}
928924
}
929925

930-
for (li = 0, i = 0; i <state->num_conns; i++) {
931-
size_t pcli;
926+
for (li = 0; li <state->num_loops; li++) {
927+
struct test_smb2_bench_path_contention_shared_loop *loop = &state->loops[li];
932928

933-
for (pcli = 0; pcli < torture_qdepth; pcli++) {
934-
struct test_smb2_bench_path_contention_shared_loop *loop = &state->loops[li];
935-
936-
tevent_schedule_immediate(loop->im,
937-
tctx->ev,
938-
test_smb2_bench_path_contention_loop_start,
939-
loop);
940-
}
929+
tevent_schedule_immediate(loop->im,
930+
tctx->ev,
931+
test_smb2_bench_path_contention_loop_start,
932+
loop);
941933
}
942934

943935
torture_comment(tctx, "Opened %zu connections with qdepth=%d => %zu loops\n",
@@ -1347,17 +1339,13 @@ static bool test_smb2_bench_read(struct torture_context *tctx,
13471339
}
13481340
}
13491341

1350-
for (li = 0, i = 0; i <state->num_conns; i++) {
1351-
size_t pcli;
1342+
for (li = 0; li <state->num_loops; li++) {
1343+
struct test_smb2_bench_read_loop *loop = &state->loops[li];
13521344

1353-
for (pcli = 0; pcli < torture_qdepth; pcli++) {
1354-
struct test_smb2_bench_read_loop *loop = &state->loops[li];
1355-
1356-
tevent_schedule_immediate(loop->im,
1357-
tctx->ev,
1358-
test_smb2_bench_read_loop_start,
1359-
loop);
1360-
}
1345+
tevent_schedule_immediate(loop->im,
1346+
tctx->ev,
1347+
test_smb2_bench_read_loop_start,
1348+
loop);
13611349
}
13621350

13631351
torture_comment(tctx, "Opened %zu connections with qdepth=%d => %zu loops\n",
@@ -1833,17 +1821,13 @@ static bool test_smb2_bench_session_setup(struct torture_context *tctx,
18331821
}
18341822
}
18351823

1836-
for (li = 0, i = 0; i <state->num_conns; i++) {
1837-
size_t pcli;
1824+
for (li = 0; li <state->num_loops; li++) {
1825+
struct test_smb2_bench_session_setup_shared_loop *loop = &state->loops[li];
18381826

1839-
for (pcli = 0; pcli < torture_qdepth; pcli++) {
1840-
struct test_smb2_bench_session_setup_shared_loop *loop = &state->loops[li];
1841-
1842-
tevent_schedule_immediate(loop->im,
1843-
tctx->ev,
1844-
test_smb2_bench_session_setup_loop_start,
1845-
loop);
1846-
}
1827+
tevent_schedule_immediate(loop->im,
1828+
tctx->ev,
1829+
test_smb2_bench_session_setup_loop_start,
1830+
loop);
18471831
}
18481832

18491833
torture_comment(tctx, "Opened %zu connections with qdepth=%d => %zu loops\n",

0 commit comments

Comments
 (0)