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

synchronization state bugs address

Browse Source
This commit is contained in:
Joel Sherrill
1996-02-01 21:54:40 +00:00
parent 665356af66
commit f00a0522a4
2 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
c/src/exec/score/src/threadq.c
View File

@@ -366,9 +366,10 @@ void _Thread_queue_Enqueue_fifo (
_ISR_Disable( level ); _ISR_Disable( level );
the_thread_queue->sync = FALSE;
switch ( the_thread_queue->sync_state ) { switch ( the_thread_queue->sync_state ) {
case THREAD_QUEUE_NOTHING_HAPPENED: case THREAD_QUEUE_NOTHING_HAPPENED:
the_thread_queue->sync = FALSE;
_Chain_Append_unprotected( _Chain_Append_unprotected(
&the_thread_queue->Queues.Fifo, &the_thread_queue->Queues.Fifo,
&the_thread->Object.Node &the_thread->Object.Node
@@ -448,7 +449,8 @@ Thread_Control *_Thread_queue_Dequeue_fifo(
_Thread_MP_Free_proxy( the_thread ); _Thread_MP_Free_proxy( the_thread );
return the_thread; return the_thread;
} else if ( the_thread_queue->sync ) { } else if ( the_thread_queue->sync &&
the_thread_queue->sync_state != THREAD_QUEUE_SATISFIED ) {
the_thread_queue->sync_state = THREAD_QUEUE_SATISFIED; the_thread_queue->sync_state = THREAD_QUEUE_SATISFIED;
_ISR_Enable( level ); _ISR_Enable( level );
return _Thread_Executing; return _Thread_Executing;
@@ -602,11 +604,12 @@ restart_forward_search:
search_thread = search_thread =
(Thread_Control *)search_thread->Object.Node.next; (Thread_Control *)search_thread->Object.Node.next;
} }
if ( the_thread_queue->sync_state != THREAD_QUEUE_NOTHING_HAPPENED )
goto syncronize;
the_thread_queue->sync = FALSE; the_thread_queue->sync = FALSE;
if ( the_thread_queue->sync_state != THREAD_QUEUE_NOTHING_HAPPENED )
goto syncronize;
if ( priority == search_priority ) if ( priority == search_priority )
goto equal_priority; goto equal_priority;
@@ -646,11 +649,12 @@ restart_reverse_search:
search_thread = (Thread_Control *) search_thread = (Thread_Control *)
search_thread->Object.Node.previous; search_thread->Object.Node.previous;
} }
if ( the_thread_queue->sync_state != THREAD_QUEUE_NOTHING_HAPPENED )
goto syncronize;
the_thread_queue->sync = FALSE; the_thread_queue->sync = FALSE;
if ( the_thread_queue->sync_state != THREAD_QUEUE_NOTHING_HAPPENED )
goto syncronize;
if ( priority == search_priority ) if ( priority == search_priority )
goto equal_priority; goto equal_priority;
@@ -755,7 +759,8 @@ Thread_Control *_Thread_queue_Dequeue_priority(
} }
} }
if ( the_thread_queue->sync ) { if ( the_thread_queue->sync &&
the_thread_queue->sync_state != THREAD_QUEUE_SATISFIED ) {
the_thread_queue->sync_state = THREAD_QUEUE_SATISFIED; the_thread_queue->sync_state = THREAD_QUEUE_SATISFIED;
_ISR_Enable( level ); _ISR_Enable( level );
return _Thread_Executing; return _Thread_Executing;

19
cpukit/score/src/threadq.c
View File

@@ -366,9 +366,10 @@ void _Thread_queue_Enqueue_fifo (
_ISR_Disable( level ); _ISR_Disable( level );
the_thread_queue->sync = FALSE;
switch ( the_thread_queue->sync_state ) { switch ( the_thread_queue->sync_state ) {
case THREAD_QUEUE_NOTHING_HAPPENED: case THREAD_QUEUE_NOTHING_HAPPENED:
the_thread_queue->sync = FALSE;
_Chain_Append_unprotected( _Chain_Append_unprotected(
&the_thread_queue->Queues.Fifo, &the_thread_queue->Queues.Fifo,
&the_thread->Object.Node &the_thread->Object.Node
@@ -448,7 +449,8 @@ Thread_Control *_Thread_queue_Dequeue_fifo(
_Thread_MP_Free_proxy( the_thread ); _Thread_MP_Free_proxy( the_thread );
return the_thread; return the_thread;
} else if ( the_thread_queue->sync ) { } else if ( the_thread_queue->sync &&
the_thread_queue->sync_state != THREAD_QUEUE_SATISFIED ) {
the_thread_queue->sync_state = THREAD_QUEUE_SATISFIED; the_thread_queue->sync_state = THREAD_QUEUE_SATISFIED;
_ISR_Enable( level ); _ISR_Enable( level );
return _Thread_Executing; return _Thread_Executing;
@@ -602,11 +604,12 @@ restart_forward_search:
search_thread = search_thread =
(Thread_Control *)search_thread->Object.Node.next; (Thread_Control *)search_thread->Object.Node.next;
} }
if ( the_thread_queue->sync_state != THREAD_QUEUE_NOTHING_HAPPENED )
goto syncronize;
the_thread_queue->sync = FALSE; the_thread_queue->sync = FALSE;
if ( the_thread_queue->sync_state != THREAD_QUEUE_NOTHING_HAPPENED )
goto syncronize;
if ( priority == search_priority ) if ( priority == search_priority )
goto equal_priority; goto equal_priority;
@@ -646,11 +649,12 @@ restart_reverse_search:
search_thread = (Thread_Control *) search_thread = (Thread_Control *)
search_thread->Object.Node.previous; search_thread->Object.Node.previous;
} }
if ( the_thread_queue->sync_state != THREAD_QUEUE_NOTHING_HAPPENED )
goto syncronize;
the_thread_queue->sync = FALSE; the_thread_queue->sync = FALSE;
if ( the_thread_queue->sync_state != THREAD_QUEUE_NOTHING_HAPPENED )
goto syncronize;
if ( priority == search_priority ) if ( priority == search_priority )
goto equal_priority; goto equal_priority;
@@ -755,7 +759,8 @@ Thread_Control *_Thread_queue_Dequeue_priority(
} }
} }
if ( the_thread_queue->sync ) { if ( the_thread_queue->sync &&
the_thread_queue->sync_state != THREAD_QUEUE_SATISFIED ) {
the_thread_queue->sync_state = THREAD_QUEUE_SATISFIED; the_thread_queue->sync_state = THREAD_QUEUE_SATISFIED;
_ISR_Enable( level ); _ISR_Enable( level );
return _Thread_Executing; return _Thread_Executing;