From a1bfb335c0cc274513e144da46e203bff29e000b Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 1 Sep 2011 18:24:57 +0000 Subject: 2011-09-01 Joel Sherrill PR 1895/cpukit * posix/src/mqueuerecvsupp.c, posix/src/pthreadjoin.c, score/src/coretodmsecstoticks.c, score/src/coretodusectoticks.c, score/src/timespectoticks.c: Ensure time conversions to ticks do not ignore partial tick and return 1 less than desired. --- cpukit/posix/src/mqueuerecvsupp.c | 9 ++++++--- cpukit/posix/src/pthreadjoin.c | 21 +++++++++++---------- 2 files changed, 17 insertions(+), 13 deletions(-) (limited to 'cpukit/posix') diff --git a/cpukit/posix/src/mqueuerecvsupp.c b/cpukit/posix/src/mqueuerecvsupp.c index 9c3fb47371..717fef8c9d 100644 --- a/cpukit/posix/src/mqueuerecvsupp.c +++ b/cpukit/posix/src/mqueuerecvsupp.c @@ -11,7 +11,7 @@ * This code ignores the O_RDONLY/O_WRONLY/O_RDWR flag at open * time. * - * COPYRIGHT (c) 1989-2008. + * COPYRIGHT (c) 1989-2011. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -105,8 +105,11 @@ ssize_t _POSIX_Message_queue_Receive_support( ); _Thread_Enable_dispatch(); - *msg_prio = - _POSIX_Message_queue_Priority_from_core(_Thread_Executing->Wait.count); + if (msg_prio) { + *msg_prio = _POSIX_Message_queue_Priority_from_core( + _Thread_Executing->Wait.count + ); + } if ( !_Thread_Executing->Wait.return_code ) return length_out; diff --git a/cpukit/posix/src/pthreadjoin.c b/cpukit/posix/src/pthreadjoin.c index 0b7e103614..38f2389ea4 100644 --- a/cpukit/posix/src/pthreadjoin.c +++ b/cpukit/posix/src/pthreadjoin.c @@ -55,20 +55,21 @@ on_EINTR: if ( the_thread->current_state == (STATES_WAITING_FOR_JOIN_AT_EXIT | STATES_TRANSIENT) ) { - return_pointer = the_thread->Wait.return_argument; - _Thread_Clear_state( - the_thread, - (STATES_WAITING_FOR_JOIN_AT_EXIT | STATES_TRANSIENT) - ); + return_pointer = the_thread->Wait.return_argument; + _Thread_Clear_state( + the_thread, + (STATES_WAITING_FOR_JOIN_AT_EXIT | STATES_TRANSIENT) + ); + _Thread_Enable_dispatch(); } else { - _Thread_Executing->Wait.return_argument = &return_pointer; + _Thread_Executing->Wait.return_argument = &return_pointer; _Thread_queue_Enter_critical_section( &api->Join_List ); _Thread_queue_Enqueue( &api->Join_List, WATCHDOG_NO_TIMEOUT ); - } - _Thread_Enable_dispatch(); + _Thread_Enable_dispatch(); - if ( _Thread_Executing->Wait.return_code == EINTR ) - goto on_EINTR; + if ( _Thread_Executing->Wait.return_code == EINTR ) + goto on_EINTR; + } if ( value_ptr ) *value_ptr = return_pointer; -- cgit v1.2.3