Changeset f9a2d36 in rtems

Timestamp:

Jun 2, 2015, 11:57:35 AM (5 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, master

Children:

863dcf4

Parents:

2764bd43

git-author:

Sebastian Huber <sebastian.huber@…> (06/02/15 11:57:35)

git-committer:

Sebastian Huber <sebastian.huber@…> (06/03/15 07:18:52)

Message:

posix: Fix _POSIX_Timer_Insert_helper() locking

Close #2358.

File:

• cpukit/posix/src/timerinserthelper.c (modified) (3 diffs)

cpukit/posix/src/timerinserthelper.c

@@ -38 +38 @@
 )
 {
-  ISR_Level            level;
+  ISR_lock_Context  lock_context;
+  Watchdog_Header  *header;
 
   _Watchdog_Remove_ticks( timer );
-  _ISR_Disable( level );
+
+  header = &_Watchdog_Ticks_header;
+  _Watchdog_Acquire( header, &lock_context );
 
     /*
@@ -48 +51 @@
      */
     if ( timer->state != WATCHDOG_INACTIVE ) {
-      _ISR_Enable( level );
+      _Watchdog_Release( header, &lock_context );
       return false;
     }
@@ -57 +60 @@
      */
     _Watchdog_Initialize( timer, TSR, id, arg );
-    _Watchdog_Insert_ticks( timer, ticks );
-  _ISR_Enable( level );
+    timer->initial = ticks;
+    _Watchdog_Insert_locked( header, timer, &lock_context );
+  _Watchdog_Release( header, &lock_context );
   return true;
 }