The patch is the test for pthread_getcpuclockid. The patch will not run since there is no support for pthread_cpuclockid in clock_gettime function the patch compiled with no errors It is tested against the patch https://lists.rtems.org/pipermail/devel/2020-March/058176.html Can you all review it and check if it is logically correct? and what changes are required for it to be pushed
thanks:) -Eshan --- testsuites/psxtests/Makefile.am | 9 + testsuites/psxtests/configure.ac | 1 + testsuites/psxtests/psxgetcpuclockid01/init.c | 161 ++++++++++++++++++ .../psxgetcpuclockid01/psxgetcpuclockid01.doc | 23 +++ .../psxgetcpuclockid01/psxgetcpuclockid01.scn | 4 + 5 files changed, 198 insertions(+) create mode 100644 testsuites/psxtests/psxgetcpuclockid01/init.c create mode 100644 testsuites/psxtests/psxgetcpuclockid01/psxgetcpuclockid01.doc create mode 100644 testsuites/psxtests/psxgetcpuclockid01/psxgetcpuclockid01.scn diff --git a/testsuites/psxtests/Makefile.am b/testsuites/psxtests/Makefile.am index 1f9e4233ec..7924bbea5d 100755 --- a/testsuites/psxtests/Makefile.am +++ b/testsuites/psxtests/Makefile.am @@ -462,6 +462,15 @@ psxgetattrnp01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxgetattrnp01) \ $(support_includes) -I$(top_srcdir)/include endif +if TEST_psxgetcpuclockid01 +psx_tests += psxgetcpuclockid01 +psx_screens += psxgetcpuclockid01/psxgetcpuclockid01.scn +psx_docs += psxgetcpuclockid01/psxgetcpuclockid01.doc +psxgetcpuclockid01_SOURCES = psxgetcpuclockid01/init.c +psxgetcpuclockid01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxgetcpuclockid01) \ + $(support_includes) +endif + if TEST_psxgetrusage01 psx_tests += psxgetrusage01 psx_screens += psxgetrusage01/psxgetrusage01.scn diff --git a/testsuites/psxtests/configure.ac b/testsuites/psxtests/configure.ac index 139787cccb..c509086abc 100644 --- a/testsuites/psxtests/configure.ac +++ b/testsuites/psxtests/configure.ac @@ -91,6 +91,7 @@ RTEMS_TEST_CHECK([psxfile01]) RTEMS_TEST_CHECK([psxfile02]) RTEMS_TEST_CHECK([psxfilelock01]) RTEMS_TEST_CHECK([psxgetattrnp01]) +RTEMS_TEST_CHECK([psxgetcpuclockid01]) RTEMS_TEST_CHECK([psxgetrusage01]) RTEMS_TEST_CHECK([psxglobalcon01]) RTEMS_TEST_CHECK([psxglobalcon02]) diff --git a/testsuites/psxtests/psxgetcpuclockid01/init.c b/testsuites/psxtests/psxgetcpuclockid01/init.c new file mode 100644 index 0000000000..938ff39e71 --- /dev/null +++ b/testsuites/psxtests/psxgetcpuclockid01/init.c @@ -0,0 +1,161 @@ +/* + * @file + * @brief Test suite for getcpuclockid methods + */ + +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (C) 2020 Eshan Dhawan, Vaibhav Gupta + * + * 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. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <errno.h> +#include <pthread.h> +#include <stdint.h> +#include <stdio.h> +#include <string.h> +#include <rtems.h> +#include <rtems/timespec.h> +#include <rtems/test.h> +#include <time.h> +#include <unistd.h> + +#include "tmacros.h" +#include "test_support.h" + +const char rtems_test_name[] = "PSXGETCPUCLOCKID 1"; + +/* Forward declaration to avoid warnings */ +void *POSIX_Init (void * argument); +void *test_pthread(void *); + +/* test_pthread function begins */ +void *test_pthread(void *arg) +{ + int i; + /*do something*/ + for( i = 0; i < 200000; i++ ); + + pthread_exit(0); + return NULL; +} + +/* init test function begins */ +void *POSIX_Init (void * argument) +{ + TEST_BEGIN(); + + int r; + clockid_t cid; + pthread_t thread_id; + struct timespec start_cpu, start_wall, finish; + struct timespec time_passed_wall, time_passed_cpu ; + bool result ; + /* setting the timespecs to zero */ + rtems_timespec_zero( &start_cpu ); + rtems_timespec_zero( &start_wall ); + rtems_timespec_zero( &finish ); + rtems_timespec_zero( &time_passed_wall ); + rtems_timespec_zero( &time_passed_cpu ); + /* getting the cpu_clock_id of the thread */ + r = pthread_getcpuclockid( pthread_self(), &cid ); + if ( r ) { + printf( "pthread_getcpuclockid : %s (%d) \n", strerror(r), r ); + } + rtems_test_assert( r == 0 ); + /* getting the strat cpu time of the pthread */ + r = clock_gettime( cid, &start_cpu ); + if ( r ) { + printf( "clock_gettime : %s (%d) \n", strerror(r), r ); + } + rtems_test_assert( r == 0 ); + /* starting the wall time */ + r = clock_gettime( CLOCK_MONOTONIC, &start_wall ); + if ( r ) { + printf( "clock_gettime : %s (%d) \n", strerror(r), r ); + } + rtems_test_assert( r == 0 ); + /* starting the loop for .5 seconds of wall time passed */ + while (1) { + /* getting the wall time */ + clock_gettime( CLOCK_MONOTONIC, &finish ); + /* calculating the time elapsed */ + rtems_timespec_subtract( &start_wall, &finish, &time_passed_wall ); + if(time_passed_wall.tv_nsec >= 500000000 || time_passed_wall.tv_sec >= 0.5 ){ + break; + } + } + /* getting the end cpu clock time */ + clock_gettime( cid, &finish ); + /* calculating the cpu time elapsed */ + rtems_timespec_subtract( &start_cpu, &finish, &time_passed_cpu ); + /* comparing the wall and cpu times*/ + /* cpu time should be greater then the wall time */ + result = rtems_timespec_less_than( &time_passed_wall, &time_passed_cpu ); + /* checking the result */ + if( !result ) + { + printf( "CPU time elapsed is less than the wall time" ); + } + rtems_test_assert( result ); + /* creating a pthread to chech for ESRCH Exeption */ + r= pthread_create( &thread_id, NULL, test_pthread, NULL ); + if( r ) { + printf( "pthread_create : %s (%d)\n", strerror(r), r ); + } + rtems_test_assert( r == 0 ); + /* joinin the pthread to make the thread_id invalid */ + r = pthread_join( thread_id, NULL ); + if( r ) { + printf( "pthread_join : %s (%d)\n", strerror(r), r ); + } + rtems_test_assert( r == 0 ); + /* checking the ESRCH Exeption */ + r = pthread_getcpuclockid( thread_id, &cid ); + if( r != ESRCH ) { + printf( "pthread_getcpuclockid : %s (%d) \n", strerror(r), r ); + } + rtems_test_assert( r == ESRCH ); + + TEST_END(); + rtems_test_exit(0); +} + +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER + +#define CONFIGURE_MAXIMUM_POSIX_THREADS 2 +#define CONFIGURE_MAXIMUM_TASKS 1 + +#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION + +#define CONFIGURE_POSIX_INIT_THREAD_TABLE + +#define CONFIGURE_INIT + +#include <rtems/confdefs.h> diff --git a/testsuites/psxtests/psxgetcpuclockid01/psxgetcpuclockid01.doc b/testsuites/psxtests/psxgetcpuclockid01/psxgetcpuclockid01.doc new file mode 100644 index 0000000000..ef148182d5 --- /dev/null +++ b/testsuites/psxtests/psxgetcpuclockid01/psxgetcpuclockid01.doc @@ -0,0 +1,23 @@ +# COPYRIGHT (c) 2020 +# On-Line Applications Research Corporation (OAR). +# +# SPDX-License-Identifier: BSD-2-Clause +# + +This file describes the directives and concepts tested by this test set. + +test set name: psxgetcpuclockid 1 + +Directives: + Pthread_getcpuclockid() + +Concepts: + ++ This test exercises the getcpuclockid methods. + ++ For pthread_getcpuclockid it created a pthread using pthread_create and + then finds the clockid_t of that thread then used gettime() add a pause of .5 seconds + and then ends the thread. + After the thread is ended it again tried to find the clockid_t of the thread to + check for ESRCH exception. + diff --git a/testsuites/psxtests/psxgetcpuclockid01/psxgetcpuclockid01.scn b/testsuites/psxtests/psxgetcpuclockid01/psxgetcpuclockid01.scn new file mode 100644 index 0000000000..937a908fd5 --- /dev/null +++ b/testsuites/psxtests/psxgetcpuclockid01/psxgetcpuclockid01.scn @@ -0,0 +1,4 @@ +*** BEGIN OF TEST PSXGETCLOCKID 1 *** + +*** END OF TEST PSXGETCPUCLOCKID 1 *** + -- 2.17.1 _______________________________________________ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel