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

score: Optimize thread queue enqueue

Browse Source 
Optimize the enqueue to empty thread queue case.
This commit is contained in:
Sebastian Huber
2016-08-10 08:37:16 +02:00
parent e41308eab8
commit 1f210ac139
1 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
cpukit/score/src/threadqops.c
View File

@@ -45,27 +45,30 @@ static void _Thread_queue_Do_nothing_extract(
static Thread_queue_Heads *_Thread_queue_Queue_enqueue( static Thread_queue_Heads *_Thread_queue_Queue_enqueue(
Thread_queue_Queue *queue, Thread_queue_Queue *queue,
Thread_Control *the_thread, Thread_Control *the_thread,
void ( *initialize )( Thread_queue_Heads * ), void ( *initialize )( Thread_queue_Heads *, Thread_Control * ),
void ( *enqueue )( Thread_queue_Heads *, Thread_Control * ) void ( *enqueue )( Thread_queue_Heads *, Thread_Control * )
) )
{ {
Thread_queue_Heads *heads = queue->heads; Thread_queue_Heads *heads;
Thread_queue_Heads *spare_heads = the_thread->Wait.spare_heads; Thread_queue_Heads *spare_heads;
heads = queue->heads;
spare_heads = the_thread->Wait.spare_heads;
the_thread->Wait.spare_heads = NULL; the_thread->Wait.spare_heads = NULL;
if ( heads == NULL ) { if ( heads == NULL ) {
_Assert( spare_heads != NULL ); _Assert( spare_heads != NULL );
_Assert( _Chain_Is_empty( &spare_heads->Free_chain ) ); _Assert( _Chain_Is_empty( &spare_heads->Free_chain ) );
heads = spare_heads; heads = spare_heads;
queue->heads = heads; queue->heads = heads;
( *initialize )( heads ); _Chain_Prepend_unprotected( &heads->Free_chain, &spare_heads->Free_node );
( *initialize )( heads, the_thread );
} else {
_Chain_Prepend_unprotected( &heads->Free_chain, &spare_heads->Free_node );
( *enqueue )( heads, the_thread );
} }
_Chain_Prepend_unprotected( &heads->Free_chain, &spare_heads->Free_node );
( *enqueue )( heads, the_thread );
return heads; return heads;
} }
@@ -92,10 +95,12 @@ static void _Thread_queue_Queue_extract(
} }
static void _Thread_queue_FIFO_do_initialize( static void _Thread_queue_FIFO_do_initialize(
Thread_queue_Heads *heads Thread_queue_Heads *heads,
Thread_Control *the_thread
) )
{ {
_Chain_Initialize_empty( &heads->Heads.Fifo ); _Chain_Initialize_node( &the_thread->Wait.Node.Chain );
_Chain_Initialize_one( &heads->Heads.Fifo, &the_thread->Wait.Node.Chain );
} }
static void _Thread_queue_FIFO_do_enqueue( static void _Thread_queue_FIFO_do_enqueue(
@@ -235,14 +240,23 @@ static void _Thread_queue_Priority_priority_change(
} }
static void _Thread_queue_Priority_do_initialize( static void _Thread_queue_Priority_do_initialize(
Thread_queue_Heads *heads Thread_queue_Heads *heads,
Thread_Control *the_thread
) )
{ {
Thread_queue_Priority_queue *priority_queue;
priority_queue = _Thread_queue_Priority_queue( heads, the_thread );
#if defined(RTEMS_SMP) #if defined(RTEMS_SMP)
_Chain_Initialize_empty( &heads->Heads.Fifo ); _Chain_Initialize_one( &heads->Heads.Fifo, &priority_queue->Node );
#else
_RBTree_Initialize_empty( &heads->Heads.Priority.Queue );
#endif #endif
_RBTree_Initialize_node( &the_thread->Wait.Node.RBTree );
_RBTree_Initialize_one(
&priority_queue->Queue,
&the_thread->Wait.Node.RBTree
);
} }
static void _Thread_queue_Priority_do_enqueue( static void _Thread_queue_Priority_do_enqueue(
@@ -250,9 +264,10 @@ static void _Thread_queue_Priority_do_enqueue(
Thread_Control *the_thread Thread_Control *the_thread
) )
{ {
Thread_queue_Priority_queue *priority_queue = Thread_queue_Priority_queue *priority_queue;
_Thread_queue_Priority_queue( heads, the_thread ); Priority_Control current_priority;
Priority_Control current_priority;
priority_queue = _Thread_queue_Priority_queue( heads, the_thread );
#if defined(RTEMS_SMP) #if defined(RTEMS_SMP)
if ( _RBTree_Is_empty( &priority_queue->Queue ) ) { if ( _RBTree_Is_empty( &priority_queue->Queue ) ) {