From 8df57649b09f31a58660d9b3c2478195f15f40ce Mon Sep 17 00:00:00 2001 From: Zacchaeus Leung Date: Fri, 6 Aug 2021 11:20:41 -0400 Subject: Test needed for timer_create with CLOCK_MONOTONC the timer_create() method can use CLOCK_MONOTONIC but there was no test for this. Also it implements the functionality to create a CLOCK_MONOTONIC timer and gettime() . Closes #3888 --- cpukit/posix/src/psxtimercreate.c | 3 ++- cpukit/posix/src/timergettime.c | 48 ++++++++++++++++++++++++--------------- 2 files changed, 32 insertions(+), 19 deletions(-) (limited to 'cpukit/posix') diff --git a/cpukit/posix/src/psxtimercreate.c b/cpukit/posix/src/psxtimercreate.c index a63cf1d100..2b5a10140f 100644 --- a/cpukit/posix/src/psxtimercreate.c +++ b/cpukit/posix/src/psxtimercreate.c @@ -40,7 +40,7 @@ int timer_create( { POSIX_Timer_Control *ptimer; - if ( clock_id != CLOCK_REALTIME ) + if ( clock_id != CLOCK_REALTIME && clock_id != CLOCK_MONOTONIC ) rtems_set_errno_and_return_minus_one( EINVAL ); if ( !timerid ) @@ -91,6 +91,7 @@ int timer_create( ptimer->timer_data.it_value.tv_nsec = 0; ptimer->timer_data.it_interval.tv_sec = 0; ptimer->timer_data.it_interval.tv_nsec = 0; + ptimer->clock_type = clock_id; _Watchdog_Preinitialize( &ptimer->Timer, _Per_CPU_Get_snapshot() ); _Watchdog_Initialize( &ptimer->Timer, _POSIX_Timer_TSR ); diff --git a/cpukit/posix/src/timergettime.c b/cpukit/posix/src/timergettime.c index ee2a566f0e..f4b259678c 100644 --- a/cpukit/posix/src/timergettime.c +++ b/cpukit/posix/src/timergettime.c @@ -28,6 +28,7 @@ #include #include #include +#include /* * - When a timer is initialized, the value of the time in @@ -42,32 +43,43 @@ int timer_gettime( ) { POSIX_Timer_Control *ptimer; - ISR_lock_Context lock_context; - uint64_t now; - uint32_t remaining; + ISR_lock_Context lock_context; + Per_CPU_Control *cpu; + struct timespec now; + struct timespec expire; + struct timespec result; if ( !value ) rtems_set_errno_and_return_minus_one( EINVAL ); ptimer = _POSIX_Timer_Get( timerid, &lock_context ); - if ( ptimer != NULL ) { - Per_CPU_Control *cpu; + if ( ptimer == NULL ) { + rtems_set_errno_and_return_minus_one( EINVAL ); + } - cpu = _POSIX_Timer_Acquire_critical( ptimer, &lock_context ); - now = cpu->Watchdog.ticks; + cpu = _POSIX_Timer_Acquire_critical( ptimer, &lock_context ); + rtems_timespec_from_ticks( ptimer->Timer.expire, &expire ); - if ( now < ptimer->Timer.expire ) { - remaining = (uint32_t) ( ptimer->Timer.expire - now ); - } else { - remaining = 0; - } + if ( ptimer->clock_type == CLOCK_MONOTONIC ) { + _Timecounter_Nanouptime(&now); + } else if (ptimer->clock_type == CLOCK_REALTIME) { + _TOD_Get(&now); + } else { + _POSIX_Timer_Release( cpu, &lock_context ); + rtems_set_errno_and_return_minus_one( EINVAL ); + } - _Timespec_From_ticks( remaining, &value->it_value ); - value->it_interval = ptimer->timer_data.it_interval; - _POSIX_Timer_Release( cpu, &lock_context ); - return 0; + if ( rtems_timespec_less_than( &now, &expire ) ) { + rtems_timespec_subtract( &now, &expire, &result ); + } else { + result.tv_nsec = 0; + result.tv_sec = 0; } - rtems_set_errno_and_return_minus_one( EINVAL ); -} + value->it_value = result; + value->it_interval = ptimer->timer_data.it_interval; + + _POSIX_Timer_Release( cpu, &lock_context ); + return 0; +} \ No newline at end of file -- cgit v1.2.3