From 1666ffe535b5e2ca801dafa13437fc2bd041cd3a Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 19 Oct 2017 14:17:31 +0200 Subject: score: Rename function threadq support function Rename _Thread_queue_Context_set_do_nothing_enqueue_callout() into _Thread_queue_Context_set_enqueue_do_nothing_extra(). More _Thread_queue_Context_set_enqueue_*() functions will follow. Update #3117. Update #3182. --- cpukit/posix/src/mutexlocksupp.c | 2 +- cpukit/posix/src/nanosleep.c | 5 +---- cpukit/posix/src/pbarrierwait.c | 2 +- cpukit/posix/src/pthreadjoin.c | 2 +- cpukit/posix/src/semtimedwait.c | 2 +- cpukit/posix/src/sigtimedwait.c | 2 +- 6 files changed, 6 insertions(+), 9 deletions(-) (limited to 'cpukit/posix') diff --git a/cpukit/posix/src/mutexlocksupp.c b/cpukit/posix/src/mutexlocksupp.c index 507d667164..4b0f366629 100644 --- a/cpukit/posix/src/mutexlocksupp.c +++ b/cpukit/posix/src/mutexlocksupp.c @@ -34,7 +34,7 @@ Status_Control _POSIX_Mutex_Seize_slow( queue_context, STATES_WAITING_FOR_MUTEX ); - _Thread_queue_Context_set_do_nothing_enqueue_callout( queue_context ); + _Thread_queue_Context_set_enqueue_do_nothing_extra( queue_context ); _Thread_queue_Context_set_deadlock_callout( queue_context, _Thread_queue_Deadlock_status diff --git a/cpukit/posix/src/nanosleep.c b/cpukit/posix/src/nanosleep.c index b2c169373a..e8a7fe14c1 100644 --- a/cpukit/posix/src/nanosleep.c +++ b/cpukit/posix/src/nanosleep.c @@ -51,10 +51,7 @@ static inline int nanosleep_helper( &queue_context, STATES_WAITING_FOR_TIME | STATES_INTERRUPTIBLE_BY_SIGNAL ); - _Thread_queue_Context_set_enqueue_callout( - &queue_context, - _Thread_queue_Enqueue_do_nothing - ); + _Thread_queue_Context_set_enqueue_do_nothing_extra( &queue_context ); if ( discipline == WATCHDOG_ABSOLUTE ) { _Thread_queue_Context_set_absolute_timeout( &queue_context, ticks ); diff --git a/cpukit/posix/src/pbarrierwait.c b/cpukit/posix/src/pbarrierwait.c index 9719112256..b9785216b4 100644 --- a/cpukit/posix/src/pbarrierwait.c +++ b/cpukit/posix/src/pbarrierwait.c @@ -53,7 +53,7 @@ int pthread_barrier_wait( pthread_barrier_t *_barrier ) &queue_context, STATES_WAITING_FOR_BARRIER ); - _Thread_queue_Context_set_do_nothing_enqueue_callout( &queue_context ); + _Thread_queue_Context_set_enqueue_do_nothing_extra( &queue_context ); _Thread_queue_Context_set_no_timeout( &queue_context ); _Thread_queue_Enqueue( &barrier->Queue.Queue, diff --git a/cpukit/posix/src/pthreadjoin.c b/cpukit/posix/src/pthreadjoin.c index 12f49e55d8..b6981fd9b3 100644 --- a/cpukit/posix/src/pthreadjoin.c +++ b/cpukit/posix/src/pthreadjoin.c @@ -39,7 +39,7 @@ static int _POSIX_Threads_Join( pthread_t thread, void **value_ptr ) void *value; _Thread_queue_Context_initialize( &queue_context ); - _Thread_queue_Context_set_do_nothing_enqueue_callout( &queue_context ); + _Thread_queue_Context_set_enqueue_do_nothing_extra( &queue_context ); _Thread_queue_Context_set_no_timeout( &queue_context ); the_thread = _Thread_Get( thread, &queue_context.Lock_context.Lock_context ); diff --git a/cpukit/posix/src/semtimedwait.c b/cpukit/posix/src/semtimedwait.c index f00557c38d..90e6866341 100644 --- a/cpukit/posix/src/semtimedwait.c +++ b/cpukit/posix/src/semtimedwait.c @@ -72,7 +72,7 @@ int sem_timedwait( &queue_context, STATES_WAITING_FOR_SEMAPHORE ); - _Thread_queue_Context_set_do_nothing_enqueue_callout( &queue_context ); + _Thread_queue_Context_set_enqueue_do_nothing_extra( &queue_context ); _Thread_queue_Context_set_relative_timeout( &queue_context, ticks ); _Thread_queue_Context_set_ISR_level( &queue_context, level ); _Thread_queue_Enqueue( diff --git a/cpukit/posix/src/sigtimedwait.c b/cpukit/posix/src/sigtimedwait.c index f96c32ef45..70170bf2f7 100644 --- a/cpukit/posix/src/sigtimedwait.c +++ b/cpukit/posix/src/sigtimedwait.c @@ -160,7 +160,7 @@ int sigtimedwait( &queue_context, STATES_WAITING_FOR_SIGNAL | STATES_INTERRUPTIBLE_BY_SIGNAL ); - _Thread_queue_Context_set_do_nothing_enqueue_callout( &queue_context ); + _Thread_queue_Context_set_enqueue_do_nothing_extra( &queue_context ); _Thread_queue_Enqueue( &_POSIX_signals_Wait_queue.Queue, POSIX_SIGNALS_TQ_OPERATIONS, -- cgit v1.2.3