RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

score: Rename function threadq support function

Browse Source 
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.
This commit is contained in:
Sebastian Huber
2017-10-19 14:17:31 +02:00
parent 6de1f92121
commit 1666ffe535
19 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cpukit/posix/src/mutexlocksupp.c
View File

@@ -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

5
cpukit/posix/src/nanosleep.c
View File

@@ -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 );

2
cpukit/posix/src/pbarrierwait.c
View File

@@ -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,

2
cpukit/posix/src/pthreadjoin.c
View File

@@ -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 );

2
cpukit/posix/src/semtimedwait.c
View File

@@ -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(

2
cpukit/posix/src/sigtimedwait.c
View File

@@ -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,

2
cpukit/score/include/rtems/score/coresemimpl.h
View File

@@ -188,7 +188,7 @@ RTEMS_INLINE_ROUTINE Status_Control _CORE_semaphore_Seize(
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_Enqueue(
&the_semaphore->Wait_queue.Queue,
operations,

2
cpukit/score/include/rtems/score/threadq.h
View File

@@ -204,7 +204,7 @@ struct Thread_queue_Context {
* The callout is invoked after the release of the thread queue lock with
* thread dispatching disabled. Afterwards the thread is blocked.
*
* @see _Thread_queue_Enqueue_do_nothing().
* @see _Thread_queue_Enqueue_do_nothing_extra().
*/
Thread_queue_Enqueue_callout enqueue_callout;

10
cpukit/score/include/rtems/score/threadqimpl.h
View File

@@ -62,7 +62,7 @@ typedef struct {
Thread_queue_Queue Queue;
} Thread_queue_Syslock_queue;
void _Thread_queue_Enqueue_do_nothing(
void _Thread_queue_Enqueue_do_nothing_extra(
Thread_queue_Queue *queue,
Thread_Control *the_thread,
Thread_queue_Context *queue_context
@@ -142,11 +142,11 @@ _Thread_queue_Context_set_enqueue_callout(
* @see _Thread_queue_Enqueue().
*/
RTEMS_INLINE_ROUTINE void
_Thread_queue_Context_set_do_nothing_enqueue_callout(
_Thread_queue_Context_set_enqueue_do_nothing_extra(
Thread_queue_Context *queue_context
)
{
queue_context->enqueue_callout = _Thread_queue_Enqueue_do_nothing;
queue_context->enqueue_callout = _Thread_queue_Enqueue_do_nothing_extra;
}
/**
@@ -615,7 +615,7 @@ Thread_Control *_Thread_queue_Do_dequeue(
* - _Thread_queue_Context_set_thread_state(),
*
* - _Thread_queue_Context_set_enqueue_callout() or
* _Thread_queue_Context_set_do_nothing_enqueue_callout(),
* _Thread_queue_Context_set_enqueue_do_nothing_extra(),
*
* - _Thread_queue_Context_set_no_timeout() or
* _Thread_queue_Context_set_relative_timeout() or
@@ -651,7 +651,7 @@ Thread_Control *_Thread_queue_Do_dequeue(
* &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_no_timeout( &queue_context );
* _Thread_queue_Context_set_deadlock_callout(
* queue_context,

2
cpukit/score/src/corebarrierwait.c
View File

@@ -48,7 +48,7 @@ Status_Control _CORE_barrier_Seize(
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_Enqueue(
&the_barrier->Wait_queue.Queue,
CORE_BARRIER_TQ_OPERATIONS,

2
cpukit/score/src/coremsgseize.c
View File

@@ -117,7 +117,7 @@ Status_Control _CORE_message_queue_Seize(
queue_context,
STATES_WAITING_FOR_MESSAGE
);
_Thread_queue_Context_set_do_nothing_enqueue_callout( queue_context );
_Thread_queue_Context_set_enqueue_do_nothing_extra( queue_context );
_Thread_queue_Enqueue(
&the_message_queue->Wait_queue.Queue,
the_message_queue->operations,

2
cpukit/score/src/coremsgsubmit.c
View File

@@ -135,7 +135,7 @@ Status_Control _CORE_message_queue_Submit(
queue_context,
STATES_WAITING_FOR_MESSAGE
);
_Thread_queue_Context_set_do_nothing_enqueue_callout( queue_context );
_Thread_queue_Context_set_enqueue_do_nothing_extra( queue_context );
_Thread_queue_Enqueue(
&the_message_queue->Wait_queue.Queue,
the_message_queue->operations,

2
cpukit/score/src/coremutexseize.c
View File

@@ -36,7 +36,7 @@ Status_Control _CORE_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

2
cpukit/score/src/corerwlockobtainread.c
View File

@@ -77,7 +77,7 @@ Status_Control _CORE_RWLock_Seize_for_reading(
queue_context,
STATES_WAITING_FOR_RWLOCK
);
_Thread_queue_Context_set_do_nothing_enqueue_callout( queue_context );
_Thread_queue_Context_set_enqueue_do_nothing_extra( queue_context );
_Thread_queue_Enqueue(
&the_rwlock->Queue.Queue,
CORE_RWLOCK_TQ_OPERATIONS,

2
cpukit/score/src/corerwlockobtainwrite.c
View File

@@ -71,7 +71,7 @@ Status_Control _CORE_RWLock_Seize_for_writing(
queue_context,
STATES_WAITING_FOR_RWLOCK
);
_Thread_queue_Context_set_do_nothing_enqueue_callout( queue_context );
_Thread_queue_Context_set_enqueue_do_nothing_extra( queue_context );
_Thread_queue_Enqueue(
&the_rwlock->Queue.Queue,
CORE_RWLOCK_TQ_OPERATIONS,

2
cpukit/score/src/futex.c
View File

@@ -94,7 +94,7 @@ int _Futex_Wait( struct _Futex_Control *_futex, int *uaddr, int val )
&queue_context,
STATES_WAITING_FOR_FUTEX
);
_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_Context_set_ISR_level( &queue_context, level );
_Thread_queue_Enqueue(

2
cpukit/score/src/mutex.c
View File

@@ -102,7 +102,7 @@ static void _Mutex_Acquire_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_fatal

2
cpukit/score/src/semaphore.c
View File

@@ -60,7 +60,7 @@ void _Semaphore_Wait( struct _Semaphore_Control *_sem )
&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_no_timeout( &queue_context );
_Thread_queue_Context_set_ISR_level( &queue_context, level );
_Thread_queue_Enqueue(

2
cpukit/score/src/threadqenqueue.c
View File

@@ -356,7 +356,7 @@ bool _Thread_queue_Path_acquire_critical(
return true;
}
void _Thread_queue_Enqueue_do_nothing(
void _Thread_queue_Enqueue_do_nothing_extra(
Thread_queue_Queue *queue,
Thread_Control *the_thread,
Thread_queue_Context *queue_context