On Wed, Feb 22, 2017 at 6:55 AM, Christophe Milard <
christophe.mil...@linaro.org> wrote:
> making sure that enumerators are probed.
>
> Signed-off-by: Christophe Milard <christophe.mil...@linaro.org>
> ---
> .../validation/drv/drvdriver/.gitignore | 1 +
> .../validation/drv/drvdriver/Makefile.am | 11 +
> .../validation/drv/drvdriver/drvdriver_enumr.c | 303
> +++++++++++++++++++++
> .../validation/drv/drvdriver/drvdriver_enumr.h | 24 ++
> .../drv/drvdriver/drvdriver_enumr_main.c | 12 +
> test/linux-generic/Makefile.am | 1 +
> 6 files changed, 352 insertions(+)
> create mode 100644 test/common_plat/validation/
> drv/drvdriver/drvdriver_enumr.c
> create mode 100644 test/common_plat/validation/
> drv/drvdriver/drvdriver_enumr.h
> create mode 100644 test/common_plat/validation/
> drv/drvdriver/drvdriver_enumr_main.c
>
> diff --git a/test/common_plat/validation/drv/drvdriver/.gitignore
> b/test/common_plat/validation/drv/drvdriver/.gitignore
> index 9268315..a842448 100644
> --- a/test/common_plat/validation/drv/drvdriver/.gitignore
> +++ b/test/common_plat/validation/drv/drvdriver/.gitignore
> @@ -1 +1,2 @@
> drvdriver_enumr_class_main
> +drvdriver_enumr_main
> diff --git a/test/common_plat/validation/drv/drvdriver/Makefile.am
> b/test/common_plat/validation/drv/drvdriver/Makefile.am
> index 9e941ee..3476c50 100644
> --- a/test/common_plat/validation/drv/drvdriver/Makefile.am
> +++ b/test/common_plat/validation/drv/drvdriver/Makefile.am
> @@ -14,3 +14,14 @@ drvdriver_enumr_class_main_LDADD =
> libtestdrvdriverenumrclass.la \
> $(LIBCUNIT_COMMON) $(LIBODP)
>
> EXTRA_DIST = drvdriver_enumr_class.h
> +
> +#tests for enumerator registration:
> +noinst_LTLIBRARIES += libtestdrvdriverenumr.la
> +libtestdrvdriverenumr_la_SOURCES = drvdriver_enumr.c
> +
> +test_PROGRAMS += drvdriver_enumr_main$(EXEEXT)
> +dist_drvdriver_enumr_main_SOURCES = drvdriver_enumr_main.c
> +drvdriver_enumr_main_LDADD = libtestdrvdriverenumr.la \
> + $(LIBCUNIT_COMMON) $(LIBODP)
> +
> +EXTRA_DIST += drvdriver_enumr.h
> diff --git a/test/common_plat/validation/drv/drvdriver/drvdriver_enumr.c
> b/test/common_plat/validation/drv/drvdriver/drvdriver_enumr.c
> new file mode 100644
> index 0000000..cf844cf
> --- /dev/null
> +++ b/test/common_plat/validation/drv/drvdriver/drvdriver_enumr.c
> @@ -0,0 +1,303 @@
> +/* Copyright (c) 2017, Linaro Limited
> + * All rights reserved.
> + *
> + * SPDX-License-Identifier: BSD-3-Clause
> + */
> +
> +#include <odp_drv.h>
> +#include <odp_api.h>
> +#include <odp_cunit_common.h>
> +#include "drvdriver_enumr.h"
> +#include <stdlib.h>
> +
> +static odp_instance_t odp_instance;
> +static odpdrv_enumr_class_t enumr_class1, enumr_class2;
> +
> +/* markers showing that different stages have been run */
> +static int enumr1_probed;
> +static int enumr2_probed;
> +static int enumr3_probed;
> +static int enumr4_probed;
> +
> +/* forward declaration */
> +static int enumr1_probe(void);
> +static int enumr2_probe(void);
> +static int enumr3_probe(void);
> +static int enumr4_probe(void);
> +
> +static int enumr1_remove(void);
> +static int enumr2_remove(void);
> +static int enumr3_remove(void);
> +static int enumr4_remove(void);
> +
> +static int enumr_class1_probe(void);
> +static int enumr_class2_probe(void);
> +
> +static int enumr_class1_remove(void);
> +static int enumr_class2_remove(void);
> +
> +/* because many things to be checked are performed during ODP
> initialisation,
> + * the initialisation functions have to be a part of the test
> + */
> +static int tests_global_init(void)
> +{
> + if (0 != odp_init_global(&odp_instance, NULL, NULL)) {
> + fprintf(stderr, "error: odp_init_global() failed.\n");
> + return -1;
> + }
> + if (0 != odp_init_local(odp_instance, ODP_THREAD_CONTROL)) {
> + fprintf(stderr, "error: odp_init_local() failed.\n");
> + return -1;
> + }
> +
> + return 0;
> +}
> +
> +static int tests_global_term(void)
> +{
> + if (0 != odp_term_local()) {
> + fprintf(stderr, "error: odp_term_local() failed.\n");
> + return -1;
> + }
> +
> + if (0 != odp_term_global(odp_instance)) {
> + fprintf(stderr, "error: odp_term_global() failed.\n");
> + return -1;
> + }
> +
> + return 0;
> +}
> +
> +/*enumerator register functions */
> +static odpdrv_enumr_t enumr1_register(void)
> +{
> + odpdrv_enumr_param_t param = {
> + .enumr_class = enumr_class1,
> + .api_name = "Enumerator_interface_1",
> + .api_version = 1,
> + .probe = enumr1_probe,
> + .remove = enumr1_remove,
> + .register_notifier = NULL
> + };
> +
> + return odpdrv_enumr_register(¶m);
> +}
> +
> +static odpdrv_enumr_t enumr2_register(void)
> +{
> + odpdrv_enumr_param_t param = {
> + .enumr_class = enumr_class1,
> + .api_name = "Enumerator_interface_2",
> + .api_version = 1,
> + .probe = enumr2_probe,
> + .remove = enumr2_remove,
> + .register_notifier = NULL
> + };
> +
> + return odpdrv_enumr_register(¶m);
> +}
> +
> +static odpdrv_enumr_t enumr3_register(void)
> +{
> + odpdrv_enumr_param_t param = {
> + .enumr_class = enumr_class1,
> + .api_name = "Enumerator_interface_3",
> + .api_version = 1,
> + .probe = enumr3_probe,
> + .remove = enumr3_remove,
> + .register_notifier = NULL
> + };
> +
> + return odpdrv_enumr_register(¶m);
> +}
> +
> +static odpdrv_enumr_t enumr4_register(void)
> +{
> + odpdrv_enumr_param_t param = {
> + .enumr_class = enumr_class2,
> + .api_name = "Enumerator_interface_4",
> + .api_version = 1,
> + .probe = enumr4_probe,
> + .remove = enumr4_remove,
> + .register_notifier = NULL
> + };
> +
> + return odpdrv_enumr_register(¶m);
> +}
> +
> +static odpdrv_enumr_t enumr_invalid_register(void)
> +{
> + odpdrv_enumr_param_t param = {
> + .enumr_class = NULL,
> + .api_name = "Enumerator_interface_invalid",
> + .api_version = 1,
> + .probe = enumr4_probe,
> + .remove = enumr4_remove,
> + .register_notifier = NULL
> + };
> +
> + return odpdrv_enumr_register(¶m);
> +}
> +
> +/*enumerator probe functions, just making sure they have been ran: */
>
Grammar: have been run
> +static int enumr1_probe(void)
> +{
> + enumr1_probed = 1;
> + return 0;
> +}
> +
> +static int enumr2_probe(void)
> +{
> + enumr2_probed = 1;
> + return 0;
> +}
> +
> +static int enumr3_probe(void)
> +{
> + enumr3_probed = 1;
> + return 0;
> +}
> +
> +static int enumr4_probe(void)
> +{
> + enumr4_probed = 1;
> + return 0;
> +}
> +
> +/*enumerator remove functions, just making sure they have been ran: */
>
been run
> +static int enumr1_remove(void)
> +{
> + enumr1_probed = -1;
> + return 0;
> +}
> +
> +static int enumr2_remove(void)
> +{
> + enumr2_probed = -1;
> + return 0;
> +}
> +
> +static int enumr3_remove(void)
> +{
> + enumr3_probed = -1;
> + return 0;
> +}
> +
> +static int enumr4_remove(void)
> +{
> + enumr4_probed = -1;
> + return 0;
> +}
> +
> +/*enumerator class register functions, all "statically linked"
> + *(i.e. directely run at start), due to the fact that platorm independent
> + * shared lib loading in autotools is a mess */
> +static void __attribute__ ((constructor)) enumr_class1_register(void)
>
Same comment here about having an ODPDRV_CONSTRUCTOR macro
> +{
> + odpdrv_enumr_class_param_t param = {
> + .name = "Enumerator_class1",
> + .probe = enumr_class1_probe,
> + .remove = enumr_class1_remove
> + };
> +
> + enumr_class1 = odpdrv_enumr_class_register(¶m);
> +}
> +
> +static void __attribute__ ((constructor)) enumr_class2_register(void)
> +{
> + odpdrv_enumr_class_param_t param = {
> + .name = "Enumerator_class2",
> + .probe = enumr_class2_probe,
> + .remove = enumr_class2_remove
> + };
> +
> + enumr_class2 = odpdrv_enumr_class_register(¶m);
> +}
> +
> +/*enumerator class probe functions, registering enumerators: */
> +static int enumr_class1_probe(void)
> +{
> + CU_ASSERT(enumr1_register() != ODPDRV_ENUMR_INVALID);
> + CU_ASSERT(enumr2_register() != ODPDRV_ENUMR_INVALID);
> + CU_ASSERT(enumr3_register() != ODPDRV_ENUMR_INVALID);
> +
> + CU_ASSERT(enumr_invalid_register() == ODPDRV_ENUMR_INVALID);
> +
> + return 0;
> +}
> +
> +static int enumr_class2_probe(void)
> +{
> + CU_ASSERT(enumr4_register() != ODPDRV_ENUMR_INVALID);
> + return 0;
> +}
> +
> +/*enumerator class remove functions, just making sure they have been ran:
> */
>
been run
> +static int enumr_class1_remove(void)
> +{
> + return 0;
> +}
> +
> +static int enumr_class2_remove(void)
> +{
> + return 0;
> +}
> +
> +void drvdriver_test_enumr_register(void)
> +{
> + CU_ASSERT(enumr1_probed == 0);
> + CU_ASSERT(enumr2_probed == 0);
> + CU_ASSERT(enumr3_probed == 0);
> + CU_ASSERT(enumr4_probed == 0);
> +
> + CU_ASSERT(tests_global_init() == 0);
> +
> + /* at this point (after odp init), the (__constructor__)
> + * enumerator classes should have registered and been probed:
> + */
> + CU_ASSERT(odpdrv_print_all() == 0);
> +
> + CU_ASSERT(enumr1_probed == 1);
> + CU_ASSERT(enumr2_probed == 1);
> + CU_ASSERT(enumr3_probed == 1);
> + CU_ASSERT(enumr4_probed == 1);
> +
> + CU_ASSERT(tests_global_term() == 0);
> +
> + /* after ODP terminaison completion, all enumerators should be
> removed*/
> + CU_ASSERT(enumr1_probed == -1);
> + CU_ASSERT(enumr2_probed == -1);
> + CU_ASSERT(enumr3_probed == -1);
> + CU_ASSERT(enumr4_probed == -1);
> +}
> +
> +odp_testinfo_t drvdriver_suite_enumr[] = {
> + ODP_TEST_INFO(drvdriver_test_enumr_register),
> + ODP_TEST_INFO_NULL,
> +};
> +
> +odp_suiteinfo_t drvdriver_suites_enumr[] = {
> + {"Enumerator registration", NULL, NULL, drvdriver_suite_enumr},
> + ODP_SUITE_INFO_NULL,
> +};
> +
> +int drvdriver_enumr_main(int argc, char *argv[])
> +{
> + int ret;
> +
> + /* parse common options: */
> + if (odp_cunit_parse_options(argc, argv))
> + return -1;
> +
> + /* prevent default ODP init: */
> + odp_cunit_register_global_init(NULL);
> + odp_cunit_register_global_term(NULL);
> +
> + /* register the tests: */
> + ret = odp_cunit_register(drvdriver_suites_enumr);
> +
> + if (ret == 0)
> + ret = odp_cunit_run();
> +
> + return ret;
> +}
> diff --git a/test/common_plat/validation/drv/drvdriver/drvdriver_enumr.h
> b/test/common_plat/validation/drv/drvdriver/drvdriver_enumr.h
> new file mode 100644
> index 0000000..afe814a
> --- /dev/null
> +++ b/test/common_plat/validation/drv/drvdriver/drvdriver_enumr.h
> @@ -0,0 +1,24 @@
> +/* Copyright (c) 2017, Linaro Limited
> + * All rights reserved.
> + *
> + * SPDX-License-Identifier: BSD-3-Clause
> + */
> +
> +#ifndef _ODP_TEST_DRVDRIVER_ENUMR_H_
> +#define _ODP_TEST_DRVDRIVER_ENUMR_H_
> +
> +#include <odp_cunit_common.h>
> +
> +/* test functions: */
> +void drvdriver_test_enumr_register(void);
> +
> +/* test arrays: */
> +extern odp_testinfo_t drvdriver_suite_enumr[];
> +
> +/* test registry: */
> +extern odp_suiteinfo_t drvdriver_suites_enumr[];
> +
> +/* main test program: */
> +int drvdriver_enumr_main(int argc, char *argv[]);
> +
> +#endif
> diff --git a/test/common_plat/validation/drv/drvdriver/drvdriver_enumr_main.c
> b/test/common_plat/validation/drv/drvdriver/drvdriver_enumr_main.c
> new file mode 100644
> index 0000000..53bc192
> --- /dev/null
> +++ b/test/common_plat/validation/drv/drvdriver/drvdriver_enumr_main.c
> @@ -0,0 +1,12 @@
> +/* Copyright (c) 2017, Linaro Limited
> + * All rights reserved.
> + *
> + * SPDX-License-Identifier: BSD-3-Clause
> + */
> +
> +#include "drvdriver_enumr.h"
> +
> +int main(int argc, char *argv[])
> +{
> + return drvdriver_enumr_main(argc, argv);
> +}
> diff --git a/test/linux-generic/Makefile.am b/test/linux-generic/Makefile.
> am
> index 16a5cb6..a0606f3 100644
> --- a/test/linux-generic/Makefile.am
> +++ b/test/linux-generic/Makefile.am
> @@ -37,6 +37,7 @@ TESTS = validation/api/pktio/pktio_run.sh \
> $(ALL_API_VALIDATION_DIR)/system/system_main$(EXEEXT) \
> $(ALL_DRV_VALIDATION_DIR)/drvatomic/drvatomic_main$(EXEEXT) \
> $(ALL_DRV_VALIDATION_DIR)/drvdriver/drvdriver_enumr_
> class_main$(EXEEXT)\
> + $(ALL_DRV_VALIDATION_DIR)/drvdriver/drvdriver_enumr_main$(EXEEXT)\
> $(ALL_DRV_VALIDATION_DIR)/drvshmem/drvshmem_main$(EXEEXT) \
> ring/ring_main$(EXEEXT)
>
> --
> 2.7.4
>
>
