Changeset a61f1a46 in rtems

Timestamp:

08/06/96 16:24:41 (27 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

0f99198

Parents:

06883e13

Message:

_POSIX_Threads_Delete_extension: reorder to eliminate use of local pointer
variable before set.

pthread_join: using local variable so user can pass NULL pointer as argument

Files:

• c/src/exec/posix/src/pthread.c (modified) (6 diffs)
• cpukit/posix/src/pthread.c (modified) (6 diffs)

c/src/exec/posix/src/pthread.c

@@ -173 +173 @@
   void              **value_ptr;
 
-  (void) _Workspace_Free( deleted->API_Extensions[ THREAD_API_POSIX ] );
- 
-  deleted->API_Extensions[ THREAD_API_POSIX ] = NULL;
-
+  api = deleted->API_Extensions[ THREAD_API_POSIX ];
+ 
   /* XXX run cancellation handlers */
 
@@ -184 +182 @@
    *  Wakeup all the tasks which joined with this one
    */
- 
-  api = deleted->API_Extensions[ THREAD_API_POSIX ];
  
   value_ptr = (void **) deleted->Wait.return_argument;
@@ -194 +190 @@
   if ( api->schedpolicy == SCHED_SPORADIC )
     (void) _Watchdog_Remove( &api->Sporadic_timer );
+
+  deleted->API_Extensions[ THREAD_API_POSIX ] = NULL;
+
+  (void) _Workspace_Free( api );
 }
 
@@ -1018 +1018 @@
   POSIX_API_Control       *api;
   Objects_Locations        location;
+  void                    *return_pointer;
 
   the_thread = _POSIX_Threads_Get( thread, &location );
@@ -1041 +1042 @@
        */
 
-      _Thread_Executing->Wait.return_argument = (unsigned32 *) value_ptr;
+      _Thread_Executing->Wait.return_argument = (unsigned32 *) &return_pointer;
 
       _Thread_queue_Enter_critical_section( &api->Join_List );
@@ -1049 +1050 @@
       _Thread_Enable_dispatch();
 
+      if ( value_ptr )
+        *value_ptr = return_pointer;
       return 0;
   }

cpukit/posix/src/pthread.c

@@ -173 +173 @@
   void              **value_ptr;
 
-  (void) _Workspace_Free( deleted->API_Extensions[ THREAD_API_POSIX ] );
- 
-  deleted->API_Extensions[ THREAD_API_POSIX ] = NULL;
-
+  api = deleted->API_Extensions[ THREAD_API_POSIX ];
+ 
   /* XXX run cancellation handlers */
 
@@ -184 +182 @@
    *  Wakeup all the tasks which joined with this one
    */
- 
-  api = deleted->API_Extensions[ THREAD_API_POSIX ];
  
   value_ptr = (void **) deleted->Wait.return_argument;
@@ -194 +190 @@
   if ( api->schedpolicy == SCHED_SPORADIC )
     (void) _Watchdog_Remove( &api->Sporadic_timer );
+
+  deleted->API_Extensions[ THREAD_API_POSIX ] = NULL;
+
+  (void) _Workspace_Free( api );
 }
 
@@ -1018 +1018 @@
   POSIX_API_Control       *api;
   Objects_Locations        location;
+  void                    *return_pointer;
 
   the_thread = _POSIX_Threads_Get( thread, &location );
@@ -1041 +1042 @@
        */
 
-      _Thread_Executing->Wait.return_argument = (unsigned32 *) value_ptr;
+      _Thread_Executing->Wait.return_argument = (unsigned32 *) &return_pointer;
 
       _Thread_queue_Enter_critical_section( &api->Join_List );
@@ -1049 +1050 @@
       _Thread_Enable_dispatch();
 
+      if ( value_ptr )
+        *value_ptr = return_pointer;
       return 0;
   }