[PATCH] closes #3889

Gedare Bloom gedare at rtems.org
Wed Jul 28 14:32:51 UTC 2021


Please work on fixing the commit message for your patch locally as
discussed before, and use git-format-patch to look at how your commit
looks like in a file before you send it to the mailing list.

Use -v2 with git-format-patch to prepare the patch for submission, to
provide the email subject line with a version 2 tag.

On Tue, Jul 27, 2021 at 6:25 PM Zacchaeus Leung
<zakthertemsdev at gmail.com> wrote:
>
> adds
>
> ---
>  cpukit/include/rtems/posix/timer.h        |  1 +
>  cpukit/posix/src/psxtimercreate.c         |  5 +-
>  cpukit/posix/src/timergettime.c           | 59 +++++++++++++----------
>  testsuites/psxtests/psxtimer02/psxtimer.c | 26 ++++++++++
>  4 files changed, 63 insertions(+), 28 deletions(-)
>
> diff --git a/cpukit/include/rtems/posix/timer.h b/cpukit/include/rtems/posix/timer.h
> index bcbf07a65a..7ae089173a 100644
> --- a/cpukit/include/rtems/posix/timer.h
> +++ b/cpukit/include/rtems/posix/timer.h
> @@ -48,6 +48,7 @@ typedef struct {
>    uint32_t          ticks;      /* Number of ticks of the initialization */
>    uint32_t          overrun;    /* Number of expirations of the timer    */
>    struct timespec   time;       /* Time at which the timer was started   */
> +  clockid_t         clock_type; /* The type of timer */
>  } POSIX_Timer_Control;
>
>  /**
> diff --git a/cpukit/posix/src/psxtimercreate.c b/cpukit/posix/src/psxtimercreate.c
> index a63cf1d100..5ffdf429b4 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,7 +91,8 @@ 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 );
>    _Objects_Open_u32(&_POSIX_Timer_Information, &ptimer->Object, 0);
> diff --git a/cpukit/posix/src/timergettime.c b/cpukit/posix/src/timergettime.c
> index ee2a566f0e..2576d7ba95 100644
> --- a/cpukit/posix/src/timergettime.c
> +++ b/cpukit/posix/src/timergettime.c
> @@ -13,8 +13,6 @@
>   *  On-Line Applications Research Corporation (OAR).
>   *
>   *  The license and distribution terms for this file may be
> - *  found in the file LICENSE in this distribution or at
> - *  http://www.rtems.org/license/LICENSE.
This should not be removed

>   */
>
>  #ifdef HAVE_CONFIG_H
> @@ -28,6 +26,7 @@
>  #include <rtems/score/todimpl.h>
>  #include <rtems/score/watchdogimpl.h>
>  #include <rtems/seterr.h>
> +#include <rtems/timespec.h>
>
>  /*
>   *          - When a timer is initialized, the value of the time in
> @@ -35,39 +34,47 @@
>   *          - When this function is called, it returns the difference
>   *            between the current time and the initialization time.
>   */
> -
avoid making random whitespace changes

>  int timer_gettime(
>    timer_t            timerid,
>    struct itimerspec *value
>  )
>  {
>    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 )
> +  if ( !value )
I don't see what is changing here?

>      rtems_set_errno_and_return_minus_one( EINVAL );
>
> -  ptimer = _POSIX_Timer_Get( timerid, &lock_context );
> -  if ( ptimer != NULL ) {
> -    Per_CPU_Control *cpu;
> -
> -    cpu = _POSIX_Timer_Acquire_critical( ptimer, &lock_context );
> -    now = cpu->Watchdog.ticks;
> -
> -    if ( now < ptimer->Timer.expire ) {
> -      remaining = (uint32_t) ( ptimer->Timer.expire - now );
> -    } else {
> -      remaining = 0;
> -    }
> +  ptimer = _POSIX_Timer_Get(timerid, &lock_context);
don't change the style within the existing code. Focus your changes on
functional modifications.

> +  if ( ptimer == NULL ) {
> +    rtems_set_errno_and_return_minus_one( EINVAL );
> +  }
>
> -    _Timespec_From_ticks( remaining, &value->it_value );
> -    value->it_interval = ptimer->timer_data.it_interval;
> +  cpu = _POSIX_Timer_Acquire_critical( ptimer, &lock_context ) ;
> +  rtems_timespec_from_ticks( ptimer->Timer.expire, &expire) ;
>
> -    _POSIX_Timer_Release( cpu, &lock_context );
> -    return 0;
> +  if (ptimer->clock_type == CLOCK_MONOTONIC) {
> +  _Timecounter_Nanouptime( &now );
> +  }
> +  if (ptimer->clock_type == CLOCK_REALTIME) {
> +    _TOD_Get( &now );
>    }
>
> -  rtems_set_errno_and_return_minus_one( EINVAL );
> -}
> +
> + if( rtems_timespec_less_than( &now, &expire ) ) {
add space after if before (.

> +      rtems_timespec_subtract(&now, &expire, &result);
> +    } else {
> +      result.tv_nsec = 0;
> +      result.tv_sec  = 0;
> +    }
> +
> +  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
> diff --git a/testsuites/psxtests/psxtimer02/psxtimer.c b/testsuites/psxtests/psxtimer02/psxtimer.c
> index 9f79d33c42..c07f5422e0 100644
> --- a/testsuites/psxtests/psxtimer02/psxtimer.c
> +++ b/testsuites/psxtests/psxtimer02/psxtimer.c
> @@ -127,6 +127,32 @@ void *POSIX_Init (
>    status = timer_delete( timer );
>    fatal_posix_service_status_errno( status, EINVAL, "bad id" );
>
> +  puts( "timer_create (montonic) - bad timer id pointer - EINVAL" );
> +  status = timer_create( CLOCK_MONOTONIC, &event, NULL );
> +  fatal_posix_service_status_errno( status, EINVAL, "bad timer id" );
> +
> +  puts( "timer_create (montonic) - OK" );
> +  status = timer_create( CLOCK_MONOTONIC, NULL, &timer );
> +  posix_service_failed( status, "timer_create OK" );
> +
> +  puts( "timer_create (montonic)  - too many - EAGAIN" );
> +  status = timer_create( CLOCK_MONOTONIC, NULL, &timer1 );
> +  fatal_posix_service_status_errno( status, EAGAIN, "too many" );
> +
> +  clock_gettime( CLOCK_MONOTONIC, &now );
> +  itimer.it_value = now;
> +  itimer.it_value.tv_sec = itimer.it_value.tv_sec - 1;
> +  puts( "timer_settime  (montonic) - bad itimer value - previous time - EINVAL" );
> +  status = timer_settime( timer, TIMER_ABSTIME, &itimer, NULL );
> +  fatal_posix_service_status_errno( status, EINVAL, "bad itimer value #3" );
> +
> +  clock_gettime( CLOCK_MONOTONIC, &now );
> +  itimer.it_value = now;
> +  itimer.it_value.tv_sec = itimer.it_value.tv_sec + 1;
> +  puts( "timer_settime (montonic)  - bad id - EINVAL" );
> +  status = timer_settime( timer1, TIMER_ABSTIME, &itimer, NULL );
> +  fatal_posix_service_status_errno( status, EINVAL, "bad id" );
> +
>    TEST_END();
>    rtems_test_exit (0);
>  }
> --
> 2.32.0
>
> _______________________________________________
> devel mailing list
> devel at rtems.org
> http://lists.rtems.org/mailman/listinfo/devel


More information about the devel mailing list