From 34e4df55901e88454029af8fe57f3c585a43b3ac Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 16 Apr 2020 12:22:06 +0200 Subject: libtest: Split POSIX Keys support Update #3199. --- cpukit/libtest/t-test-rtems-objs.c | 95 ++++--------------------- cpukit/libtest/t-test-rtems-posix-keys.c | 115 +++++++++++++++++++++++++++++++ cpukit/libtest/t-test-rtems.h | 62 +++++++++++++++++ 3 files changed, 192 insertions(+), 80 deletions(-) create mode 100644 cpukit/libtest/t-test-rtems-posix-keys.c create mode 100644 cpukit/libtest/t-test-rtems.h (limited to 'cpukit/libtest') diff --git a/cpukit/libtest/t-test-rtems-objs.c b/cpukit/libtest/t-test-rtems-objs.c index a5d6b4d72f..72447fd22f 100644 --- a/cpukit/libtest/t-test-rtems-objs.c +++ b/cpukit/libtest/t-test-rtems-objs.c @@ -1,7 +1,15 @@ -/* - * SPDX-License-Identifier: BSD-2-Clause +/* SPDX-License-Identifier: BSD-2-Clause */ + +/** + * @file * - * Copyright (C) 2018 embedded brains GmbH + * @ingroup RTEMSTestFramework + * + * @brief RTEMS Objects Support for Test Framework + */ + +/* + * Copyright (C) 2018 embedded brains GmbH (http://www.embedded-brains.de) * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,15 +35,15 @@ #undef __STRICT_ANSI__ +#include "t-test-rtems.h" + #include #include -#include #include -#include -static Objects_Maximum +Objects_Maximum T_objects_count(Objects_APIs api, uint16_t cls) { const Objects_Information *information; @@ -56,7 +64,7 @@ T_objects_count(Objects_APIs api, uint16_t cls) return count; } -static void +void T_objects_check(Objects_APIs api, uint16_t cls, Objects_Maximum *expected, const char *name) { @@ -372,76 +380,3 @@ T_check_rtems_timers(T_event event, const char *name) break; }; } - -static Objects_Maximum T_posix_key_count; - -static ssize_t T_posix_key_value_count; - -static POSIX_Keys_Control * -T_get_next_posix_key(Objects_Id *id) -{ - return (POSIX_Keys_Control *) - _Objects_Get_next(*id, &_POSIX_Keys_Information, id); -} - -static ssize_t -T_get_active_posix_key_value_pairs(void) -{ - ssize_t count; - Objects_Id id; - POSIX_Keys_Control *the_key; - - count = 0; - id = OBJECTS_ID_INITIAL_INDEX; - - while ((the_key = T_get_next_posix_key(&id)) != NULL ) { - count += (ssize_t) - _Chain_Node_count_unprotected(&the_key->Key_value_pairs); - _Objects_Allocator_unlock(); - } - - return count; -} - -static void -T_posix_keys_run_initialize(void) -{ - T_posix_key_count = T_objects_count(OBJECTS_POSIX_API, - OBJECTS_POSIX_KEYS); - T_posix_key_value_count = T_get_active_posix_key_value_pairs(); -} - -static void -T_posix_keys_case_end(void) -{ - ssize_t count; - ssize_t delta; - - T_objects_check(OBJECTS_POSIX_API, OBJECTS_POSIX_KEYS, - &T_posix_key_count, "POSIX key"); - - count = T_get_active_posix_key_value_pairs(); - delta = count - T_posix_key_value_count; - - if (delta != 0) { - T_posix_key_value_count = count; - T_check_true(false, NULL, "POSIX key value pair leak (%zi)", delta); - } -} - -void -T_check_posix_keys(T_event event, const char *name) -{ - (void)name; - - switch (event) { - case T_EVENT_RUN_INITIALIZE_EARLY: - T_posix_keys_run_initialize(); - break; - case T_EVENT_CASE_END: - T_posix_keys_case_end(); - break; - default: - break; - }; -} diff --git a/cpukit/libtest/t-test-rtems-posix-keys.c b/cpukit/libtest/t-test-rtems-posix-keys.c new file mode 100644 index 0000000000..0769f68ba8 --- /dev/null +++ b/cpukit/libtest/t-test-rtems-posix-keys.c @@ -0,0 +1,115 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ + +/** + * @file + * + * @ingroup RTEMSTestFramework + * + * @brief RTEMS POSIX Keys Support for Test Framework + */ + +/* + * Copyright (C) 2018 embedded brains GmbH (http://www.embedded-brains.de) + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#undef __STRICT_ANSI__ + +#include "t-test-rtems.h" + +#include + +#include + +static Objects_Maximum T_posix_key_count; + +static ssize_t T_posix_key_value_count; + +static POSIX_Keys_Control * +T_get_next_posix_key(Objects_Id *id) +{ + return (POSIX_Keys_Control *) + _Objects_Get_next(*id, &_POSIX_Keys_Information, id); +} + +static ssize_t +T_get_active_posix_key_value_pairs(void) +{ + ssize_t count; + Objects_Id id; + POSIX_Keys_Control *the_key; + + count = 0; + id = OBJECTS_ID_INITIAL_INDEX; + + while ((the_key = T_get_next_posix_key(&id)) != NULL ) { + count += (ssize_t) + _Chain_Node_count_unprotected(&the_key->Key_value_pairs); + _Objects_Allocator_unlock(); + } + + return count; +} + +static void +T_posix_keys_run_initialize(void) +{ + T_posix_key_count = T_objects_count(OBJECTS_POSIX_API, + OBJECTS_POSIX_KEYS); + T_posix_key_value_count = T_get_active_posix_key_value_pairs(); +} + +static void +T_posix_keys_case_end(void) +{ + ssize_t count; + ssize_t delta; + + T_objects_check(OBJECTS_POSIX_API, OBJECTS_POSIX_KEYS, + &T_posix_key_count, "POSIX key"); + + count = T_get_active_posix_key_value_pairs(); + delta = count - T_posix_key_value_count; + + if (delta != 0) { + T_posix_key_value_count = count; + T_check_true(false, NULL, "POSIX key value pair leak (%zi)", delta); + } +} + +void +T_check_posix_keys(T_event event, const char *name) +{ + (void)name; + + switch (event) { + case T_EVENT_RUN_INITIALIZE_EARLY: + T_posix_keys_run_initialize(); + break; + case T_EVENT_CASE_END: + T_posix_keys_case_end(); + break; + default: + break; + }; +} diff --git a/cpukit/libtest/t-test-rtems.h b/cpukit/libtest/t-test-rtems.h new file mode 100644 index 0000000000..cc36ba96a1 --- /dev/null +++ b/cpukit/libtest/t-test-rtems.h @@ -0,0 +1,62 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ + +/** + * @file + * + * @ingroup RTEMSTestFrameworkImpl + * + * @brief RTEMS Support for Test Framework + */ + +/* + * Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _T_TEST_RTEMS_H +#define _T_TEST_RTEMS_H + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @addtogroup RTEMSTestFrameworkImpl + * + * @{ + */ + +Objects_Maximum T_objects_count(Objects_APIs api, uint16_t cls); + +void T_objects_check(Objects_APIs api, uint16_t cls, + Objects_Maximum *expected, const char *name); + +/** @} */ + +#ifdef __cplusplus +} +#endif + +#endif /* _T_TEST_RTEMS_H */ -- cgit v1.2.3