| Message ID | 1416320764-15860-1-git-send-email-yan.songming@linaro.org |
|---|---|
| State | New |
| Headers | show |
Hello Yan, please find some comments bellow. Thanks, Maxim. On 11/18/2014 05:26 PM, Yan Songming wrote: > Add the cunit test for shm. Test the base shm function. Please add more specific description. Which function and which functionality do you test. > > Signed-off-by: Yan Songming <yan.songming@linaro.org> > --- > test/cunit/Makefile.am | 9 ++-- > test/cunit/odp_cunit_common.c | 37 +++++++++++++ > test/cunit/odp_cunit_common.h | 41 ++++++++++++++ > test/cunit/odp_shm.c | 121 ++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 205 insertions(+), 3 deletions(-) > create mode 100644 test/cunit/odp_cunit_common.c > create mode 100644 test/cunit/odp_cunit_common.h > create mode 100644 test/cunit/odp_shm.c > > diff --git a/test/cunit/Makefile.am b/test/cunit/Makefile.am > index 439e134..7f528bb 100644 > --- a/test/cunit/Makefile.am > +++ b/test/cunit/Makefile.am > @@ -6,10 +6,13 @@ AM_LDFLAGS += -L$(CUNIT_PATH)/lib -static -lcunit > if ODP_CUNIT_ENABLED > TESTS = ${bin_PROGRAMS} > check_PROGRAMS = ${bin_PROGRAMS} > -bin_PROGRAMS = odp_init odp_queue > +bin_PROGRAMS = odp_init odp_queue odp_shm > odp_init_LDFLAGS = $(AM_LDFLAGS) > odp_queue_LDFLAGS = $(AM_LDFLAGS) > +odp_shm_LDFLAGS = $(AM_LDFLAGS) > endif > > -dist_odp_init_SOURCES = odp_init.c > -dist_odp_queue_SOURCES = odp_queue.c > +dist_odp_init_SOURCES = odp_init.c odp_cunit_common.c > +dist_odp_queue_SOURCES = odp_queue.c odp_cunit_common.c > +dist_odp_shm_SOURCES = odp_shm.c odp_cunit_common.c > + > diff --git a/test/cunit/odp_cunit_common.c b/test/cunit/odp_cunit_common.c > new file mode 100644 > index 0000000..11e16b9 > --- /dev/null > +++ b/test/cunit/odp_cunit_common.c > @@ -0,0 +1,37 @@ > +/* Copyright (c) 2013, Linaro Limited 2014 > + * All rights reserved. > + * > + * SPDX-License-Identifier: BSD-3-Clause > + */ > + > +/** > + * @file > + * > + * ODP test application common > + */ > + > +#include <string.h> > +#include <odp.h> > +#include "odp_cunit_common.h" > +#include "odph_linux.h" > +/* Globals */ > +static odph_linux_pthread_t thread_tbl[MAX_WORKERS]; > + > +/** create test thread */ > +int odp_cunit_thread_create(void *func_ptr(void *), pthrd_arg *arg) > +{ > + /* Create and init additional threads */ > + odph_linux_pthread_create(thread_tbl, arg->numthrds, 0, func_ptr, > + (void *)arg); > + > + return 0; > +} > + > +/** exit from test thread */ > +int odp_cunit_thread_exit(pthrd_arg *arg) > +{ > + /* Wait for other threads to exit */ > + odph_linux_pthread_join(thread_tbl, arg->numthrds); > + > + return 0; > +} > diff --git a/test/cunit/odp_cunit_common.h b/test/cunit/odp_cunit_common.h > new file mode 100644 > index 0000000..a4fd3a2 > --- /dev/null > +++ b/test/cunit/odp_cunit_common.h > @@ -0,0 +1,41 @@ > +/* Copyright (c) 2013, Linaro Limited 2014 > + * All rights reserved. > + * > + * SPDX-License-Identifier: BSD-3-Clause > + */ > + > +/** > + * @file > + * > + * ODP test application common headers > + */ > + > +#ifndef ODP_CUNICT_COMMON_H > +#define ODP_CUNICT_COMMON_H > + > +#define MAX_WORKERS 32 /**< Maximum number of work threads */ > + > +typedef struct { > + int foo; > + int bar; > +} test_shared_data_t; > + > +/** types of tests */ > +typedef enum { > + ODP_SHM_TEST = 0, > + ODP_MAX_TEST > +} odp_test_case_e; > + > +/** > + * Thread argument > + */ > +typedef struct { > + int testcase; /**< specifies which set of API's to exercise */ > + int numthrds; /**< no of pthreads to create */ > +} pthrd_arg; > + > +/** create thread fro start_routine function */ > +extern int odp_cunit_thread_create(void *func_ptr(void *), pthrd_arg *arg); > +extern int odp_cunit_thread_exit(pthrd_arg *); > + > +#endif /* ODP_COMMON_H */ > diff --git a/test/cunit/odp_shm.c b/test/cunit/odp_shm.c > new file mode 100644 > index 0000000..918bde0 > --- /dev/null > +++ b/test/cunit/odp_shm.c > @@ -0,0 +1,121 @@ > +/* Copyright (c) 2014, Linaro Limited > + * All rights reserved. > + * > + * SPDX-License-Identifier: BSD-3-Clause > + */ > + > +#include "odp.h" > +#include "CUnit/Basic.h" > +#include "odp_cunit_common.h" > + > + > +#define ALIGE_SIZE (128) > + > +const char *name = "cunit_test_shared_data"; that can be #define TESTNAME "cunit_test_shared_data" > + > +odp_shm_t shm; > + > +__thread test_shared_data_t *test_shared_data; > +static void *run_shm_thread(void *arg) > +{ > + pthrd_arg *parg = (pthrd_arg *)arg; > + odp_shm_info_t tinfo; > + odp_shm_info_t *info = &tinfo; Ugly duplication. Pointer is not needed. > + int thr; > + > + thr = odp_thread_id(); > + > + printf("Thread %i starts\n", thr); > + > + switch (parg->testcase) { > + case ODP_SHM_TEST: > + shm = odp_shm_lookup(name); > + CU_ASSERT(ODP_SHM_INVALID != shm); > + test_shared_data = odp_shm_addr(shm); > + CU_ASSERT(0 == odp_shm_info(shm, info)); > + CU_ASSERT(0 == strcmp(name, info->name)); > + CU_ASSERT(0 == info->flags); > + CU_ASSERT(test_shared_data == info->addr); > + CU_ASSERT(sizeof(test_shared_data_t) == info->size); > + CU_ASSERT(odp_sys_page_size() == info->page_size); > + odp_shm_print_all(); > + break; > + default: > + printf("Invalid test case [%d]\n", parg->testcase); > + } > + fflush(stdout); > + return parg; > +} > + > +static void test_odp_shm_sunnyday(void) > +{ > + pthrd_arg thrdarg; add empty line after vars > + shm = odp_shm_reserve(name, sizeof(test_shared_data_t), ALIGE_SIZE, 0); > + CU_ASSERT(ODP_SHM_INVALID != shm); > + > + CU_ASSERT(0 == odp_shm_free(shm)); CU_ASSERT(!odp_shm_free(shm)); > + CU_ASSERT(ODP_SHM_INVALID == odp_shm_lookup(name)); > + > + shm = odp_shm_reserve(name, sizeof(test_shared_data_t), ALIGE_SIZE, 0); > + CU_ASSERT(ODP_SHM_INVALID != shm); > + > + test_shared_data = odp_shm_addr(shm); > + CU_ASSERT(NULL != test_shared_data); > + memset(test_shared_data, 0, sizeof(test_shared_data_t)); > + > + thrdarg.testcase = ODP_SHM_TEST; > + thrdarg.numthrds = odp_sys_core_count(); > + > + if (thrdarg.numthrds > MAX_WORKERS) > + thrdarg.numthrds = MAX_WORKERS; > + > + odp_cunit_thread_create(run_shm_thread, &thrdarg); > + odp_cunit_thread_exit(&thrdarg); > +} > + > +static int finalize(void) > +{ > + odp_term_local(); > + odp_term_global(); > + return 0; > +} > + > +static int init(void) > +{ > + if (0 != odp_init_global(NULL, NULL)) { int ret = odp_init_global(NULL, NULL); if (ret) { Here is doe not make big reason. But in other places you start aligning the code closer to beginning of the line and can fit to 80 chars limitation. > + printf("odp_init_global fail.\n"); > + return -1; > + } > + if (0 != odp_init_local()) { same here > + printf("odp_init_local fail.\n"); > + return -1; > + } > + return 0; > +} > + > +int main(void) > +{ > + CU_pSuite ptr_suite = NULL; set to NULL is not needed > + > + /* initialize the CUnit test registry */ > + if (CUE_SUCCESS != CU_initialize_registry()) > + return CU_get_error(); > + > + /* add the tests to the shm suite */ > + ptr_suite = CU_add_suite(__FILE__, init, finalize); > + if (NULL == ptr_suite) { if (!prt_suite) > + CU_cleanup_registry(); > + return CU_get_error(); > + } > + > + if (NULL == CU_ADD_TEST(ptr_suite, test_odp_shm_sunnyday)) { > + CU_cleanup_registry(); > + return CU_get_error(); > + } > + > + /* Run all tests using the CUnit Basic interface */ > + CU_basic_set_mode(CU_BRM_VERBOSE); > + CU_basic_run_tests(); > + CU_cleanup_registry(); > + return CU_get_error(); > +}
Applying: cunit: add shm test /home/mike/git/odp/.git/rebase-apply/patch:31: new blank line at EOF. other nits in line On 18 November 2014 10:38, Maxim Uvarov <maxim.uvarov@linaro.org> wrote: > Hello Yan, please find some comments bellow. > > Thanks, > Maxim. > > On 11/18/2014 05:26 PM, Yan Songming wrote: > >> Add the cunit test for shm. Test the base shm function. >> > > Please add more specific description. Which function and which > functionality do you test. > > > >> Signed-off-by: Yan Songming <yan.songming@linaro.org> >> --- >> test/cunit/Makefile.am | 9 ++-- >> test/cunit/odp_cunit_common.c | 37 +++++++++++++ >> test/cunit/odp_cunit_common.h | 41 ++++++++++++++ >> test/cunit/odp_shm.c | 121 ++++++++++++++++++++++++++++++ >> ++++++++++++ >> 4 files changed, 205 insertions(+), 3 deletions(-) >> create mode 100644 test/cunit/odp_cunit_common.c >> create mode 100644 test/cunit/odp_cunit_common.h >> create mode 100644 test/cunit/odp_shm.c >> >> diff --git a/test/cunit/Makefile.am b/test/cunit/Makefile.am >> index 439e134..7f528bb 100644 >> --- a/test/cunit/Makefile.am >> +++ b/test/cunit/Makefile.am >> @@ -6,10 +6,13 @@ AM_LDFLAGS += -L$(CUNIT_PATH)/lib -static -lcunit >> if ODP_CUNIT_ENABLED >> TESTS = ${bin_PROGRAMS} >> check_PROGRAMS = ${bin_PROGRAMS} >> -bin_PROGRAMS = odp_init odp_queue >> +bin_PROGRAMS = odp_init odp_queue odp_shm >> odp_init_LDFLAGS = $(AM_LDFLAGS) >> odp_queue_LDFLAGS = $(AM_LDFLAGS) >> +odp_shm_LDFLAGS = $(AM_LDFLAGS) >> endif >> -dist_odp_init_SOURCES = odp_init.c >> -dist_odp_queue_SOURCES = odp_queue.c >> +dist_odp_init_SOURCES = odp_init.c odp_cunit_common.c >> +dist_odp_queue_SOURCES = odp_queue.c odp_cunit_common.c >> +dist_odp_shm_SOURCES = odp_shm.c odp_cunit_common.c >> + >> diff --git a/test/cunit/odp_cunit_common.c b/test/cunit/odp_cunit_common. >> c >> new file mode 100644 >> index 0000000..11e16b9 >> --- /dev/null >> +++ b/test/cunit/odp_cunit_common.c >> @@ -0,0 +1,37 @@ >> +/* Copyright (c) 2013, Linaro Limited >> > 2014 > > > + * All rights reserved. >> + * >> + * SPDX-License-Identifier: BSD-3-Clause >> + */ >> + >> +/** >> + * @file >> + * >> + * ODP test application common >> + */ >> + >> +#include <string.h> >> +#include <odp.h> >> +#include "odp_cunit_common.h" >> +#include "odph_linux.h" >> +/* Globals */ >> +static odph_linux_pthread_t thread_tbl[MAX_WORKERS]; >> + >> +/** create test thread */ >> +int odp_cunit_thread_create(void *func_ptr(void *), pthrd_arg *arg) >> +{ >> + /* Create and init additional threads */ >> + odph_linux_pthread_create(thread_tbl, arg->numthrds, 0, func_ptr, >> + (void *)arg); >> + >> + return 0; >> +} >> + >> +/** exit from test thread */ >> +int odp_cunit_thread_exit(pthrd_arg *arg) >> +{ >> + /* Wait for other threads to exit */ >> + odph_linux_pthread_join(thread_tbl, arg->numthrds); >> + >> + return 0; >> +} >> diff --git a/test/cunit/odp_cunit_common.h b/test/cunit/odp_cunit_common. >> h >> new file mode 100644 >> index 0000000..a4fd3a2 >> --- /dev/null >> +++ b/test/cunit/odp_cunit_common.h >> @@ -0,0 +1,41 @@ >> +/* Copyright (c) 2013, Linaro Limited >> > 2014 > > > + * All rights reserved. >> + * >> + * SPDX-License-Identifier: BSD-3-Clause >> + */ >> + >> +/** >> + * @file >> + * >> + * ODP test application common headers >> + */ >> + >> +#ifndef ODP_CUNICT_COMMON_H >> +#define ODP_CUNICT_COMMON_H >> + >> +#define MAX_WORKERS 32 /**< Maximum number of work threads */ >> + >> +typedef struct { >> + int foo; >> + int bar; >> +} test_shared_data_t; >> + >> +/** types of tests */ >> +typedef enum { >> + ODP_SHM_TEST = 0, >> + ODP_MAX_TEST >> +} odp_test_case_e; >> + >> +/** >> + * Thread argument >> + */ >> +typedef struct { >> + int testcase; /**< specifies which set of API's to exercise */ >> + int numthrds; /**< no of pthreads to create */ >> +} pthrd_arg; >> + >> +/** create thread fro start_routine function */ >> +extern int odp_cunit_thread_create(void *func_ptr(void *), pthrd_arg >> *arg); >> +extern int odp_cunit_thread_exit(pthrd_arg *); >> + >> +#endif /* ODP_COMMON_H */ >> diff --git a/test/cunit/odp_shm.c b/test/cunit/odp_shm.c >> new file mode 100644 >> index 0000000..918bde0 >> --- /dev/null >> +++ b/test/cunit/odp_shm.c >> @@ -0,0 +1,121 @@ >> +/* Copyright (c) 2014, Linaro Limited >> + * All rights reserved. >> + * >> + * SPDX-License-Identifier: BSD-3-Clause >> + */ >> + >> +#include "odp.h" >> +#include "CUnit/Basic.h" >> +#include "odp_cunit_common.h" >> + >> + >> +#define ALIGE_SIZE (128) >> + >> +const char *name = "cunit_test_shared_data"; >> > that can be #define TESTNAME "cunit_test_shared_data" > >> + >> +odp_shm_t shm; >> + >> +__thread test_shared_data_t *test_shared_data; >> +static void *run_shm_thread(void *arg) >> +{ >> + pthrd_arg *parg = (pthrd_arg *)arg; >> + odp_shm_info_t tinfo; >> + odp_shm_info_t *info = &tinfo; >> > Ugly duplication. Pointer is not needed. > > > > + int thr; >> + >> + thr = odp_thread_id(); >> + >> + printf("Thread %i starts\n", thr); >> + >> + switch (parg->testcase) { >> + case ODP_SHM_TEST: >> + shm = odp_shm_lookup(name); >> + CU_ASSERT(ODP_SHM_INVALID != shm); >> + test_shared_data = odp_shm_addr(shm); >> + CU_ASSERT(0 == odp_shm_info(shm, info)); >> + CU_ASSERT(0 == strcmp(name, info->name)); >> + CU_ASSERT(0 == info->flags); >> + CU_ASSERT(test_shared_data == info->addr); >> + CU_ASSERT(sizeof(test_shared_data_t) == info->size); >> + CU_ASSERT(odp_sys_page_size() == info->page_size); >> + odp_shm_print_all(); >> + break; >> + default: >> + printf("Invalid test case [%d]\n", parg->testcase); >> + } >> + fflush(stdout); >> + return parg; >> +} >> + >> +static void test_odp_shm_sunnyday(void) >> +{ >> + pthrd_arg thrdarg; >> > add empty line after vars > >> + shm = odp_shm_reserve(name, sizeof(test_shared_data_t), >> ALIGE_SIZE, 0); >> + CU_ASSERT(ODP_SHM_INVALID != shm); >> + >> + CU_ASSERT(0 == odp_shm_free(shm)); >> > CU_ASSERT(!odp_shm_free(shm)); > > > + CU_ASSERT(ODP_SHM_INVALID == odp_shm_lookup(name)); >> + >> + shm = odp_shm_reserve(name, sizeof(test_shared_data_t), >> ALIGE_SIZE, 0); >> + CU_ASSERT(ODP_SHM_INVALID != shm); >> + >> + test_shared_data = odp_shm_addr(shm); >> + CU_ASSERT(NULL != test_shared_data); >> + memset(test_shared_data, 0, sizeof(test_shared_data_t)); >> + >> + thrdarg.testcase = ODP_SHM_TEST; >> + thrdarg.numthrds = odp_sys_core_count(); >> + >> + if (thrdarg.numthrds > MAX_WORKERS) >> + thrdarg.numthrds = MAX_WORKERS; >> + >> + odp_cunit_thread_create(run_shm_thread, &thrdarg); >> + odp_cunit_thread_exit(&thrdarg); >> +} >> + >> +static int finalize(void) >> +{ >> + odp_term_local(); >> + odp_term_global(); >> + return 0; >> +} >> + >> +static int init(void) >> +{ >> + if (0 != odp_init_global(NULL, NULL)) { >> > int ret = odp_init_global(NULL, NULL); > if (ret) { > > Here is doe not make big reason. But in other places you start aligning > the code > closer to beginning of the line and can fit to 80 chars limitation. > > + printf("odp_init_global fail.\n"); >> + return -1; >> + } >> + if (0 != odp_init_local()) { >> > > same here > > + printf("odp_init_local fail.\n"); >> + return -1; >> + } >> + return 0; >> +} >> + >> +int main(void) >> +{ >> + CU_pSuite ptr_suite = NULL; >> > set to NULL is not needed > > + >> + /* initialize the CUnit test registry */ >> > Does this comment say more then the code already does ? > + if (CUE_SUCCESS != CU_initialize_registry()) >> + return CU_get_error(); >> + >> + /* add the tests to the shm suite */ >> + ptr_suite = CU_add_suite(__FILE__, init, finalize); >> + if (NULL == ptr_suite) { >> > if (!prt_suite) > > + CU_cleanup_registry(); >> + return CU_get_error(); >> + } >> + >> + if (NULL == CU_ADD_TEST(ptr_suite, test_odp_shm_sunnyday)) { >> + CU_cleanup_registry(); >> + return CU_get_error(); >> + } >> + >> + /* Run all tests using the CUnit Basic interface */ >> > Does this comment say more then the code already does ? > + CU_basic_set_mode(CU_BRM_VERBOSE); >> + CU_basic_run_tests(); >> + CU_cleanup_registry(); >> + return CU_get_error(); >> +} >> > > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > http://lists.linaro.org/mailman/listinfo/lng-odp >
diff --git a/test/cunit/Makefile.am b/test/cunit/Makefile.am index 439e134..7f528bb 100644 --- a/test/cunit/Makefile.am +++ b/test/cunit/Makefile.am @@ -6,10 +6,13 @@ AM_LDFLAGS += -L$(CUNIT_PATH)/lib -static -lcunit if ODP_CUNIT_ENABLED TESTS = ${bin_PROGRAMS} check_PROGRAMS = ${bin_PROGRAMS} -bin_PROGRAMS = odp_init odp_queue +bin_PROGRAMS = odp_init odp_queue odp_shm odp_init_LDFLAGS = $(AM_LDFLAGS) odp_queue_LDFLAGS = $(AM_LDFLAGS) +odp_shm_LDFLAGS = $(AM_LDFLAGS) endif -dist_odp_init_SOURCES = odp_init.c -dist_odp_queue_SOURCES = odp_queue.c +dist_odp_init_SOURCES = odp_init.c odp_cunit_common.c +dist_odp_queue_SOURCES = odp_queue.c odp_cunit_common.c +dist_odp_shm_SOURCES = odp_shm.c odp_cunit_common.c + diff --git a/test/cunit/odp_cunit_common.c b/test/cunit/odp_cunit_common.c new file mode 100644 index 0000000..11e16b9 --- /dev/null +++ b/test/cunit/odp_cunit_common.c @@ -0,0 +1,37 @@ +/* Copyright (c) 2013, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP test application common + */ + +#include <string.h> +#include <odp.h> +#include "odp_cunit_common.h" +#include "odph_linux.h" +/* Globals */ +static odph_linux_pthread_t thread_tbl[MAX_WORKERS]; + +/** create test thread */ +int odp_cunit_thread_create(void *func_ptr(void *), pthrd_arg *arg) +{ + /* Create and init additional threads */ + odph_linux_pthread_create(thread_tbl, arg->numthrds, 0, func_ptr, + (void *)arg); + + return 0; +} + +/** exit from test thread */ +int odp_cunit_thread_exit(pthrd_arg *arg) +{ + /* Wait for other threads to exit */ + odph_linux_pthread_join(thread_tbl, arg->numthrds); + + return 0; +} diff --git a/test/cunit/odp_cunit_common.h b/test/cunit/odp_cunit_common.h new file mode 100644 index 0000000..a4fd3a2 --- /dev/null +++ b/test/cunit/odp_cunit_common.h @@ -0,0 +1,41 @@ +/* Copyright (c) 2013, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP test application common headers + */ + +#ifndef ODP_CUNICT_COMMON_H +#define ODP_CUNICT_COMMON_H + +#define MAX_WORKERS 32 /**< Maximum number of work threads */ + +typedef struct { + int foo; + int bar; +} test_shared_data_t; + +/** types of tests */ +typedef enum { + ODP_SHM_TEST = 0, + ODP_MAX_TEST +} odp_test_case_e; + +/** + * Thread argument + */ +typedef struct { + int testcase; /**< specifies which set of API's to exercise */ + int numthrds; /**< no of pthreads to create */ +} pthrd_arg; + +/** create thread fro start_routine function */ +extern int odp_cunit_thread_create(void *func_ptr(void *), pthrd_arg *arg); +extern int odp_cunit_thread_exit(pthrd_arg *); + +#endif /* ODP_COMMON_H */ diff --git a/test/cunit/odp_shm.c b/test/cunit/odp_shm.c new file mode 100644 index 0000000..918bde0 --- /dev/null +++ b/test/cunit/odp_shm.c @@ -0,0 +1,121 @@ +/* Copyright (c) 2014, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "odp.h" +#include "CUnit/Basic.h" +#include "odp_cunit_common.h" + + +#define ALIGE_SIZE (128) + +const char *name = "cunit_test_shared_data"; + +odp_shm_t shm; + +__thread test_shared_data_t *test_shared_data; +static void *run_shm_thread(void *arg) +{ + pthrd_arg *parg = (pthrd_arg *)arg; + odp_shm_info_t tinfo; + odp_shm_info_t *info = &tinfo; + int thr; + + thr = odp_thread_id(); + + printf("Thread %i starts\n", thr); + + switch (parg->testcase) { + case ODP_SHM_TEST: + shm = odp_shm_lookup(name); + CU_ASSERT(ODP_SHM_INVALID != shm); + test_shared_data = odp_shm_addr(shm); + CU_ASSERT(0 == odp_shm_info(shm, info)); + CU_ASSERT(0 == strcmp(name, info->name)); + CU_ASSERT(0 == info->flags); + CU_ASSERT(test_shared_data == info->addr); + CU_ASSERT(sizeof(test_shared_data_t) == info->size); + CU_ASSERT(odp_sys_page_size() == info->page_size); + odp_shm_print_all(); + break; + default: + printf("Invalid test case [%d]\n", parg->testcase); + } + fflush(stdout); + return parg; +} + +static void test_odp_shm_sunnyday(void) +{ + pthrd_arg thrdarg; + shm = odp_shm_reserve(name, sizeof(test_shared_data_t), ALIGE_SIZE, 0); + CU_ASSERT(ODP_SHM_INVALID != shm); + + CU_ASSERT(0 == odp_shm_free(shm)); + CU_ASSERT(ODP_SHM_INVALID == odp_shm_lookup(name)); + + shm = odp_shm_reserve(name, sizeof(test_shared_data_t), ALIGE_SIZE, 0); + CU_ASSERT(ODP_SHM_INVALID != shm); + + test_shared_data = odp_shm_addr(shm); + CU_ASSERT(NULL != test_shared_data); + memset(test_shared_data, 0, sizeof(test_shared_data_t)); + + thrdarg.testcase = ODP_SHM_TEST; + thrdarg.numthrds = odp_sys_core_count(); + + if (thrdarg.numthrds > MAX_WORKERS) + thrdarg.numthrds = MAX_WORKERS; + + odp_cunit_thread_create(run_shm_thread, &thrdarg); + odp_cunit_thread_exit(&thrdarg); +} + +static int finalize(void) +{ + odp_term_local(); + odp_term_global(); + return 0; +} + +static int init(void) +{ + if (0 != odp_init_global(NULL, NULL)) { + printf("odp_init_global fail.\n"); + return -1; + } + if (0 != odp_init_local()) { + printf("odp_init_local fail.\n"); + return -1; + } + return 0; +} + +int main(void) +{ + CU_pSuite ptr_suite = NULL; + + /* initialize the CUnit test registry */ + if (CUE_SUCCESS != CU_initialize_registry()) + return CU_get_error(); + + /* add the tests to the shm suite */ + ptr_suite = CU_add_suite(__FILE__, init, finalize); + if (NULL == ptr_suite) { + CU_cleanup_registry(); + return CU_get_error(); + } + + if (NULL == CU_ADD_TEST(ptr_suite, test_odp_shm_sunnyday)) { + CU_cleanup_registry(); + return CU_get_error(); + } + + /* Run all tests using the CUnit Basic interface */ + CU_basic_set_mode(CU_BRM_VERBOSE); + CU_basic_run_tests(); + CU_cleanup_registry(); + return CU_get_error(); +}
Add the cunit test for shm. Test the base shm function. Signed-off-by: Yan Songming <yan.songming@linaro.org> --- test/cunit/Makefile.am | 9 ++-- test/cunit/odp_cunit_common.c | 37 +++++++++++++ test/cunit/odp_cunit_common.h | 41 ++++++++++++++ test/cunit/odp_shm.c | 121 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 205 insertions(+), 3 deletions(-) create mode 100644 test/cunit/odp_cunit_common.c create mode 100644 test/cunit/odp_cunit_common.h create mode 100644 test/cunit/odp_shm.c