Changeset 5d65d0dd in rtems

Timestamp:

06/15/16 06:50:29 (7 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

d6467102

Parents:

d07f582

git-author:

Sebastian Huber <sebastian.huber@…> (06/15/16 06:50:29)

git-committer:

Sebastian Huber <sebastian.huber@…> (06/15/16 06:55:18)

Message:

posix: Use _POSIX_Threads_Sporadic_timer_insert()

Location:

cpukit/posix

Files:

• include/rtems/posix/pthreadimpl.h (modified) (2 diffs)
• src/pthread.c (modified) (3 diffs)
• src/pthreadcreate.c (modified) (2 diffs)

cpukit/posix/include/rtems/posix/pthreadimpl.h

@@ -23 +23 @@
 #include <rtems/posix/config.h>
 #include <rtems/posix/threadsup.h>
+#include <rtems/score/assert.h>
 #include <rtems/score/objectimpl.h>
+#include <rtems/score/timespec.h>
 #include <rtems/score/threadimpl.h>
-#include <rtems/score/assert.h>
+#include <rtems/score/watchdogimpl.h>
 
 #ifdef __cplusplus
@@ -51 +53 @@
  */
 extern pthread_attr_t _POSIX_Threads_Default_attributes;
+
+RTEMS_INLINE_ROUTINE void _POSIX_Threads_Sporadic_timer_insert(
+  POSIX_API_Control *api
+)
+{
+  _Watchdog_Per_CPU_insert_relative(
+    &api->Sporadic_timer,
+    _Per_CPU_Get(),
+    _Timespec_To_ticks( &api->Attributes.schedparam.sched_ss_repl_period )
+  );
+}
 
 /**

cpukit/posix/src/pthread.c

@@ -32 +32 @@
 #include <rtems/score/threadqimpl.h>
 #include <rtems/score/userextimpl.h>
-#include <rtems/score/watchdogimpl.h>
 #include <rtems/score/wkspace.h>
 #include <rtems/posix/pthreadimpl.h>
@@ -39 +38 @@
 #include <rtems/posix/config.h>
 #include <rtems/posix/keyimpl.h>
-#include <rtems/score/timespec.h>
 #include <rtems/score/cpusetimpl.h>
 #include <rtems/score/assert.h>
@@ -120 +118 @@
 
   _Watchdog_Per_CPU_remove_relative( &api->Sporadic_timer );
-  _Watchdog_Per_CPU_insert_relative(
-    &api->Sporadic_timer,
-    _Per_CPU_Get(),
-    _Timespec_To_ticks( &api->schedparam.sched_ss_repl_period )
-  );
+  _POSIX_Threads_Sporadic_timer_insert( api );
 
   new_priority = _POSIX_Priority_To_core( api->schedparam.sched_priority );

cpukit/posix/src/pthreadcreate.c

@@ -32 +32 @@
 #include <rtems/score/apimutex.h>
 #include <rtems/score/stackimpl.h>
-#include <rtems/score/watchdogimpl.h>
 #include <rtems/score/schedulerimpl.h>
-
 
 static inline size_t _POSIX_Threads_Ensure_minimum_stack (
@@ -254 +252 @@
   if ( schedpolicy == SCHED_SPORADIC ) {
     _ISR_lock_ISR_disable( &lock_context );
-    _Watchdog_Per_CPU_insert_relative(
-      &api->Sporadic_timer,
-      _Per_CPU_Get(),
-      _Timespec_To_ticks( &api->schedparam.sched_ss_repl_period )
-    );
+    _POSIX_Threads_Sporadic_timer_insert( api );
     _ISR_lock_ISR_enable( &lock_context );
   }