Changeset 842394f in rtems

Timestamp:

09/09/11 11:25:23 (11 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, master

Children:

1a6ab4e

Parents:

fd1661f2

Message:

2011-09-09 Sebastian Huber <sebastian.huber@…>

PR 1901/cpukit

• score/src/threadhandler.c: Do not use internal tasks for global initialization in MP configuration.

Location:

cpukit

Files:

• ChangeLog (modified) (1 diff)
• score/src/threadhandler.c (modified) (3 diffs)

cpukit/ChangeLog

@@ +1 @@
+2011-09-09      Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+        PR 1901/cpukit
+        * score/src/threadhandler.c: Do not use internal tasks for global
+        initialization in MP configuration.
+
 2011-09-09      Sebastian Huber <sebastian.huber@embedded-brains.de>
 

cpukit/score/src/threadhandler.c

@@ -90 +90 @@
   Thread_Control *executing;
   #if defined(EXECUTE_GLOBAL_CONSTRUCTORS)
-    static char doneConstructors;
-    char doneCons;
+    static bool doneConstructors;
+    bool doCons;
   #endif
 
@@ -111 +111 @@
 
   #if defined(EXECUTE_GLOBAL_CONSTRUCTORS)
-    doneCons = doneConstructors;
-    doneConstructors = 1;
+    #if defined(RTEMS_MULTIPROCESSING)
+      doCons = !doneConstructors
+        && _Objects_Get_API( executing->Object.id ) != OBJECTS_INTERNAL_API;
+      if (doCons)
+        doneConstructors = true;
+    #else
+      doCons = !doneConstructors;
+      doneConstructors = true;
+    #endif
   #endif
 
@@ -144 +151 @@
      *  RTEMS target configuration.  --joel (12 May 2007)
      */
-    if (!doneCons) /* && (volatile void *)_init) */ {
+    if (doCons) /* && (volatile void *)_init) */ {
       INIT_NAME ();