From 0fb95046c2d6891623a4a68ff1c96540a25db133 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Fri, 31 Mar 2023 09:52:12 -0400 Subject: [PATCH] test: verify prealloc result to avoid skipping wrong function execution Signed-off-by: Tomasz Gromadzki --- src/test/obj_pmalloc_mt/TEST0 | 4 ++-- src/test/obj_pmalloc_mt/TEST1 | 4 ++-- src/test/obj_pmalloc_mt/TEST2 | 4 ++-- src/test/obj_pmalloc_mt/TEST3 | 4 ++-- src/test/obj_pmalloc_mt/obj_pmalloc_mt.c | 9 +++++++-- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/test/obj_pmalloc_mt/TEST0 b/src/test/obj_pmalloc_mt/TEST0 index 6e77e951bd8..fd065e9193c 100755 --- a/src/test/obj_pmalloc_mt/TEST0 +++ b/src/test/obj_pmalloc_mt/TEST0 @@ -1,6 +1,6 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2015-2019, Intel Corporation +# Copyright 2015-2023, Intel Corporation # # src/test/obj_pmalloc_mt/TEST0 -- multithreaded allocator test @@ -16,6 +16,6 @@ configure_valgrind helgrind force-enable setup PMEM_IS_PMEM_FORCE=1 expect_normal_exit\ - ./obj_pmalloc_mt$EXESUFFIX 32 1000 100 $DIR/testfile + ./obj_pmalloc_mt$EXESUFFIX 32 1000 100 $DIR/testfile0 pass diff --git a/src/test/obj_pmalloc_mt/TEST1 b/src/test/obj_pmalloc_mt/TEST1 index 672a2e27136..9c55955adb9 100755 --- a/src/test/obj_pmalloc_mt/TEST1 +++ b/src/test/obj_pmalloc_mt/TEST1 @@ -1,6 +1,6 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016-2019, Intel Corporation +# Copyright 2016-2023, Intel Corporation # # src/test/obj_pmalloc_mt/TEST1 -- multithreaded allocator test @@ -16,6 +16,6 @@ configure_valgrind helgrind force-disable setup PMEM_IS_PMEM_FORCE=1 expect_normal_exit\ - ./obj_pmalloc_mt$EXESUFFIX 32 1000 100 $DIR/testfile + ./obj_pmalloc_mt$EXESUFFIX 32 1000 100 $DIR/testfile1 pass diff --git a/src/test/obj_pmalloc_mt/TEST2 b/src/test/obj_pmalloc_mt/TEST2 index 68fb8b4543b..2abd46e192a 100755 --- a/src/test/obj_pmalloc_mt/TEST2 +++ b/src/test/obj_pmalloc_mt/TEST2 @@ -1,6 +1,6 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2015-2019, Intel Corporation +# Copyright 2015-2023, Intel Corporation # # src/test/obj_pmalloc_mt/TEST2 -- multithreaded allocator test @@ -16,6 +16,6 @@ configure_valgrind helgrind force-enable setup PMEM_IS_PMEM_FORCE=1 expect_normal_exit\ - ./obj_pmalloc_mt$EXESUFFIX 4 64 4 $DIR/testfile + ./obj_pmalloc_mt$EXESUFFIX 4 64 4 $DIR/testfile2 pass diff --git a/src/test/obj_pmalloc_mt/TEST3 b/src/test/obj_pmalloc_mt/TEST3 index b1fe2f4db84..7f230ae0e14 100755 --- a/src/test/obj_pmalloc_mt/TEST3 +++ b/src/test/obj_pmalloc_mt/TEST3 @@ -1,6 +1,6 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2015-2019, Intel Corporation +# Copyright 2015-2023, Intel Corporation # # src/test/obj_pmalloc_mt/TEST3 -- multithreaded allocator test @@ -16,6 +16,6 @@ configure_valgrind drd force-enable setup PMEM_IS_PMEM_FORCE=1 expect_normal_exit\ - ./obj_pmalloc_mt$EXESUFFIX 4 64 4 $DIR/testfile + ./obj_pmalloc_mt$EXESUFFIX 4 64 4 $DIR/testfile3 pass diff --git a/src/test/obj_pmalloc_mt/obj_pmalloc_mt.c b/src/test/obj_pmalloc_mt/obj_pmalloc_mt.c index 480ba29a087..617f203b90d 100644 --- a/src/test/obj_pmalloc_mt/obj_pmalloc_mt.c +++ b/src/test/obj_pmalloc_mt/obj_pmalloc_mt.c @@ -59,9 +59,12 @@ static void * realloc_worker(void *arg) { struct worker_args *a = arg; + int ret; for (unsigned i = 0; i < Ops_per_thread; ++i) { - prealloc(a->pop, &a->r->offs[a->idx][i], REALLOC_SIZE, 0, 0); + ret = prealloc(a->pop, &a->r->offs[a->idx][i], + REALLOC_SIZE, 0, 0); + UT_ASSERTeq(ret, 0); UT_ASSERTne(a->r->offs[a->idx][i], 0); } @@ -85,6 +88,7 @@ static void * mix_worker(void *arg) { struct worker_args *a = arg; + int ret; /* * The mix scenario is ran twice to increase the chances of run @@ -92,8 +96,9 @@ mix_worker(void *arg) */ for (unsigned j = 0; j < MIX_RERUNS; ++j) { for (unsigned i = 0; i < Ops_per_thread; ++i) { - pmalloc(a->pop, &a->r->offs[a->idx][i], + ret = pmalloc(a->pop, &a->r->offs[a->idx][i], ALLOC_SIZE, 0, 0); + UT_ASSERTeq(ret, 0); UT_ASSERTne(a->r->offs[a->idx][i], 0); }