forked from Imagelibrary/rtems
2011-07-27 Joel Sherrill <joel.sherrilL@OARcorp.com>
* posix/src/pthread.c, posix/src/pthreadjoin.c: Revert accidental commit.
This commit is contained in:
@@ -1,3 +1,8 @@
|
|||||||
|
2011-07-27 Joel Sherrill <joel.sherrilL@OARcorp.com>
|
||||||
|
|
||||||
|
* posix/src/pthread.c, posix/src/pthreadjoin.c: Revert accidental
|
||||||
|
commit.
|
||||||
|
|
||||||
2011-07-27 Petr Benes <benesp16@fel.cvut.cz>
|
2011-07-27 Petr Benes <benesp16@fel.cvut.cz>
|
||||||
|
|
||||||
PR 1856/cpukit
|
PR 1856/cpukit
|
||||||
|
|||||||
@@ -217,7 +217,7 @@ bool _POSIX_Threads_Create_extension(
|
|||||||
_Thread_queue_Initialize(
|
_Thread_queue_Initialize(
|
||||||
&api->Join_List,
|
&api->Join_List,
|
||||||
THREAD_QUEUE_DISCIPLINE_FIFO,
|
THREAD_QUEUE_DISCIPLINE_FIFO,
|
||||||
STATES_WAITING_FOR_JOIN_AT_EXIT | STATES_INTERRUPTIBLE_BY_SIGNAL,
|
STATES_WAITING_FOR_JOIN_AT_EXIT,
|
||||||
0
|
0
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -32,7 +32,6 @@ int pthread_join(
|
|||||||
Objects_Locations location;
|
Objects_Locations location;
|
||||||
void *return_pointer;
|
void *return_pointer;
|
||||||
|
|
||||||
on_EINTR:
|
|
||||||
the_thread = _Thread_Get( thread, &location );
|
the_thread = _Thread_Get( thread, &location );
|
||||||
switch ( location ) {
|
switch ( location ) {
|
||||||
|
|
||||||
@@ -61,11 +60,6 @@ on_EINTR:
|
|||||||
|
|
||||||
_Thread_Enable_dispatch();
|
_Thread_Enable_dispatch();
|
||||||
|
|
||||||
/*
|
|
||||||
if ( _Thread_Executing->Wait.return_code == EINTR )
|
|
||||||
goto on_EINTR;
|
|
||||||
*/
|
|
||||||
|
|
||||||
if ( value_ptr )
|
if ( value_ptr )
|
||||||
*value_ptr = return_pointer;
|
*value_ptr = return_pointer;
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user