Changeset edbd43c6 in rtems

Timestamp:

11/04/16 12:19:11 (6 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

df48ed2

Parents:

df63fbd1

git-author:

Sebastian Huber <sebastian.huber@…> (11/04/16 12:19:11)

git-committer:

Sebastian Huber <sebastian.huber@…> (11/07/16 06:39:41)

Message:

score: Prevent assignment to _Thread_Executing

Files:

• cpukit/score/include/rtems/score/percpu.h (modified) (1 diff)
• testsuites/tmtests/tm26/task1.c (modified) (1 diff)
• testsuites/tmtests/tm27/task1.c (modified) (3 diffs)

cpukit/score/include/rtems/score/percpu.h

@@ -683 +683 @@
   _Per_CPU_Get()->heir
 #define _Thread_Executing \
-  _Per_CPU_Get()->executing
+  _Per_CPU_Get_executing( _Per_CPU_Get() )
 #define _ISR_Nest_level \
   _Per_CPU_Get()->isr_nest_level

testsuites/tmtests/tm26/task1.c

@@ -124 +124 @@
 static void set_thread_executing( Thread_Control *thread )
 {
-#if defined( PREVENT_SMP_ASSERT_FAILURES )
-  ISR_Level level;
-
-  _ISR_Local_disable( level );
-#endif
-
-  _Thread_Executing = thread;
-
-#if defined( PREVENT_SMP_ASSERT_FAILURES )
-  _ISR_Local_enable( level );
-#endif
+  _Per_CPU_Get_snapshot()->executing = thread;
 }
 

testsuites/tmtests/tm27/task1.c

@@ -46 +46 @@
   rtems_vector_number vector
 );
+
+static void set_thread_executing( Thread_Control *thread )
+{
+  _Per_CPU_Get_snapshot()->executing = thread;
+}
 
 rtems_task Init(
@@ -192 +197 @@
 #endif
 
-  _Thread_Executing =
-        (Thread_Control *) _Chain_First(&scheduler_context->Ready[LOW_PRIORITY]);
+  set_thread_executing(
+    (Thread_Control *) _Chain_First(&scheduler_context->Ready[LOW_PRIORITY])
+  );
 
   _Thread_Dispatch_necessary = 1;
@@ -266 +272 @@
   _Scheduler_Acquire_critical( scheduler, &scheduler_lock_context );
 
-  _Thread_Executing =
-        (Thread_Control *) _Chain_First(&scheduler_context->Ready[LOW_PRIORITY]);
+  set_thread_executing(
+    (Thread_Control *) _Chain_First(&scheduler_context->Ready[LOW_PRIORITY])
+  );
 
   _Thread_Dispatch_necessary = 1;