Changeset b04ee63 in rtems

Timestamp:

03/01/02 17:49:57 (21 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

9f9871f

Parents:

49155d9

Message:

2002-03-01 Eric Norum <eric.norum@…>

• src/pthreadonce.c: Task is not preemptable while running a pthread_once init function. This is slightly less heavy handed than disabling dispatching and seems better than consuming a mutex.

Files:

• c/src/exec/posix/ChangeLog (modified) (1 diff)
• c/src/exec/posix/src/pthreadonce.c (modified) (2 diffs)
• cpukit/posix/ChangeLog (modified) (1 diff)
• cpukit/posix/src/pthreadonce.c (modified) (2 diffs)

c/src/exec/posix/ChangeLog

@@ +1 @@
+2002-03-01      Eric Norum <eric.norum@usask.ca>
+
+        * src/pthreadonce.c: Task is not preemptable while running a 
+        pthread_once init function.  This is slightly less heavy handed
+        than disabling dispatching and seems better than consuming a mutex.
+
 2002-02-09      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 

c/src/exec/posix/src/pthreadonce.c

@@ -19 +19 @@
 #include <errno.h>
 
+#include <rtems.h>
 #include <rtems/system.h>
 #include <rtems/score/thread.h>
@@ -30 +31 @@
     return EINVAL;
 
-  _Thread_Disable_dispatch();
-
   if ( !once_control->init_executed ) {
-    once_control->is_initialized = TRUE;
-    once_control->init_executed = TRUE;
-    (*init_routine)();
+    rtems_mode saveMode;
+    rtems_task_mode(RTEMS_NO_PREEMPT, RTEMS_PREEMPT_MASK, &saveMode);
+    if ( !once_control->init_executed ) {
+      once_control->is_initialized = TRUE;
+      once_control->init_executed = TRUE;
+      (*init_routine)();
+    }
+    rtems_task_mode(saveMode, RTEMS_PREEMPT_MASK, &saveMode);
   }
-
-  _Thread_Enable_dispatch();
   return 0;
 }

cpukit/posix/ChangeLog

@@ +1 @@
+2002-03-01      Eric Norum <eric.norum@usask.ca>
+
+        * src/pthreadonce.c: Task is not preemptable while running a 
+        pthread_once init function.  This is slightly less heavy handed
+        than disabling dispatching and seems better than consuming a mutex.
+
 2002-02-09      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 

cpukit/posix/src/pthreadonce.c

@@ -19 +19 @@
 #include <errno.h>
 
+#include <rtems.h>
 #include <rtems/system.h>
 #include <rtems/score/thread.h>
@@ -30 +31 @@
     return EINVAL;
 
-  _Thread_Disable_dispatch();
-
   if ( !once_control->init_executed ) {
-    once_control->is_initialized = TRUE;
-    once_control->init_executed = TRUE;
-    (*init_routine)();
+    rtems_mode saveMode;
+    rtems_task_mode(RTEMS_NO_PREEMPT, RTEMS_PREEMPT_MASK, &saveMode);
+    if ( !once_control->init_executed ) {
+      once_control->is_initialized = TRUE;
+      once_control->init_executed = TRUE;
+      (*init_routine)();
+    }
+    rtems_task_mode(saveMode, RTEMS_PREEMPT_MASK, &saveMode);
   }
-
-  _Thread_Enable_dispatch();
   return 0;
 }