From b5bfaaf9c27996d672f7aad67fee24581ab2f218 Mon Sep 17 00:00:00 2001 From: Gedare Bloom Date: Thu, 23 Jun 2016 16:55:38 -0400 Subject: posix: cond_timedwait remember and use clock from condattr updates #2745 --- cpukit/posix/include/rtems/posix/cond.h | 1 + cpukit/posix/include/rtems/posix/condimpl.h | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'cpukit/posix/include/rtems') diff --git a/cpukit/posix/include/rtems/posix/cond.h b/cpukit/posix/include/rtems/posix/cond.h index 4fa7de7525..bbb80ef362 100644 --- a/cpukit/posix/include/rtems/posix/cond.h +++ b/cpukit/posix/include/rtems/posix/cond.h @@ -44,6 +44,7 @@ typedef struct { Objects_Control Object; Thread_queue_Control Wait_queue; pthread_mutex_t mutex; + clockid_t clock; } POSIX_Condition_variables_Control; #ifdef __cplusplus diff --git a/cpukit/posix/include/rtems/posix/condimpl.h b/cpukit/posix/include/rtems/posix/condimpl.h index dbeb6e1089..70a0707b8d 100644 --- a/cpukit/posix/include/rtems/posix/condimpl.h +++ b/cpukit/posix/include/rtems/posix/condimpl.h @@ -47,11 +47,13 @@ extern Objects_Information _POSIX_Condition_variables_Information; extern const pthread_condattr_t _POSIX_Condition_variables_Default_attributes; RTEMS_INLINE_ROUTINE void _POSIX_Condition_variables_Initialize( - POSIX_Condition_variables_Control *the_cond + POSIX_Condition_variables_Control *the_cond, + pthread_condattr_t *the_attr ) { _Thread_queue_Initialize( &the_cond->Wait_queue ); the_cond->mutex = POSIX_CONDITION_VARIABLES_NO_MUTEX; + the_cond->clock = the_attr->clock; } RTEMS_INLINE_ROUTINE void _POSIX_Condition_variables_Destroy( -- cgit v1.2.3