Changeset 0960fee in rtems

Timestamp:

05/07/14 15:53:48 (10 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, master

Children:

b97bc8bc

Parents:

6c36946f

git-author:

Sebastian Huber <sebastian.huber@…> (05/07/14 15:53:48)

git-committer:

Sebastian Huber <sebastian.huber@…> (05/07/14 15:55:59)

Message:

rtems: Fix ASR SMP support

Initialize the ISR lock only once and destroy it properly.

Location:

cpukit/rtems

Files:

• include/rtems/rtems/asrimpl.h (modified) (1 diff)
• src/tasks.c (modified) (3 diffs)

cpukit/rtems/include/rtems/rtems/asrimpl.h

@@ -47 +47 @@
   asr->signals_pending = 0;
   asr->nest_level      = 0;
+}
+
+RTEMS_INLINE_ROUTINE void _ASR_Create( ASR_Information *asr )
+{
   _ISR_lock_Initialize( &asr->Lock, "ASR" );
+  _ASR_Initialize( asr );
+}
+
+RTEMS_INLINE_ROUTINE void _ASR_Destroy( ASR_Information *asr )
+{
+  _ISR_lock_Destroy( &asr->Lock );
 }
 

cpukit/rtems/src/tasks.c

@@ -57 +57 @@
   _Event_Initialize( &api->Event );
   _Event_Initialize( &api->System_event );
-  _ASR_Initialize( &api->Signal );
+  _ASR_Create( &api->Signal );
   _Thread_Action_initialize( &api->Signal_action, _Signal_Action_handler );
 #if !defined(RTEMS_SMP)
@@ -91 +91 @@
 }
 
+static void _RTEMS_tasks_Delete_extension(
+  Thread_Control *executing,
+  Thread_Control *deleted
+)
+{
+  RTEMS_API_Control *api;
+
+  api = deleted->API_Extensions[ THREAD_API_RTEMS ];
+
+  _ASR_Destroy( &api->Signal );
+}
+
 static void _RTEMS_tasks_Terminate_extension(
   Thread_Control *executing
 )
 {
-
   /*
    *  Free per task variable memory
@@ -173 +184 @@
     _RTEMS_tasks_Start_extension,             /* start */
     _RTEMS_tasks_Start_extension,             /* restart */
-    NULL,                                     /* delete */
+    _RTEMS_tasks_Delete_extension,            /* delete */
     RTEMS_TASKS_SWITCH_EXTENSION,             /* switch */
     NULL,                                     /* begin */