Changeset 5a32c48 in rtems

Timestamp:

06/14/16 13:57:54 (7 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

1a4eac50

Parents:

eec08ef

git-author:

Sebastian Huber <sebastian.huber@…> (06/14/16 13:57:54)

git-committer:

Sebastian Huber <sebastian.huber@…> (06/22/16 12:00:28)

Message:

posix: Make POSIX API aware of scheduler instances

Location:

cpukit/posix

Files:

• include/rtems/posix/priorityimpl.h (modified) (2 diffs)
• src/mutexgetprioceiling.c (modified) (1 diff)
• src/mutexinit.c (modified) (2 diffs)
• src/mutexsetprioceiling.c (modified) (2 diffs)
• src/psxpriorityisvalid.c (modified) (1 diff)
• src/pthread.c (modified) (2 diffs)
• src/pthreadcreate.c (modified) (2 diffs)
• src/pthreadgetschedparam.c (modified) (3 diffs)
• src/pthreadsetschedparam.c (modified) (4 diffs)
• src/pthreadsetschedprio.c (modified) (3 diffs)

cpukit/posix/include/rtems/posix/priorityimpl.h

@@ -31 +31 @@
  * @ingroup POSIXAPI
  *
- * @brief Interface to the POSIX Priority Implementation
- * 
+ * @brief Interface to the POSIX Priority Implementation.
+ *
+ * @{
  */
-/**@{**/
-
-/**
- * 1003.1b-1993,2.2.2.80 definition of priority, p. 19
- *
- * "Numerically higher values represent higher priorities."
- *
- * Thus, RTEMS Core has priorities run in the opposite sense of the POSIX API.
- *
- * There are only 254 posix priority levels since a task at priority level
- * 255 would never run because of the RTEMS idle task.  This is necessary
- * because GNAT maps the lowest Ada task priority to the lowest thread
- * priority.  The lowest priority Ada task should get to run, so there is
- * a fundamental conflict with having 255 priorities.
- *
- * But since RTEMS can be configured with fewer than 256 priorities,
- * we use the internal constant.
- */
-#define POSIX_SCHEDULER_MAXIMUM_PRIORITY (PRIORITY_MAXIMUM - 1)
-
 
 /**
@@ -73 +54 @@
  * @brief Check if POSIX priority is valid.
  * 
- * 1003.1b-1993,2.2.2.80 definition of priority, p. 19
+ * According to POSIX, numerically higher values represent higher priorities.
+ * Thus, SuperCore has priorities run in the opposite sense of the POSIX API.
  *
- * "Numerically higher values represent higher priorities."
+ * Let N be the maximum priority of this scheduler instance.   The SuperCore
+ * priority zero is system reserved (PRIORITY_PSEUDO_ISR).  There are only
+ * N - 1 POSIX API priority levels since a thread at SuperCore priority N would
+ * never run because of the idle threads.  This is necessary because GNAT maps
+ * the lowest Ada task priority to the lowest thread priority.  The lowest
+ * priority Ada task should get to run, so there is a fundamental conflict with
+ * having N priorities.
  *
- * Thus, RTEMS Core has priorities run in the opposite sense of the POSIX API.
+ * @param[in] scheduler The scheduler instance.
+ * @param[in] priority The POSIX API priority to test.
  *
- * @param[in] priority is the priority to test
- *
- * @retval TRUE The priority is valid.
- * @retval FALSE The priority is invalid.
+ * @retval true The priority is valid.
+ * @retval false Otherwise.
  */
 bool _POSIX_Priority_Is_valid(
-  int priority
+  const Scheduler_Control *scheduler,
+  int                      priority
 );
 
 /**
- * @brief Convert POSIX priority to SuperCore priority.
+ * @brief Converts the SuperCore priority to the corresponding POSIX API
+ * priority.
  *
- * This method converts a POSIX API priority into onto the corresponding
- * SuperCore value.
+ * @param[in] scheduler The scheduler instance.
+ * @param[in] priority The SuperCore priority to convert.
  *
- * @param[in] priority is the POSIX API priority.
- *
- * @return This method returns the corresponding SuperCore priority.
+ * @return The corresponding POSIX API priority.
  */
-RTEMS_INLINE_ROUTINE Priority_Control _POSIX_Priority_To_core(
-  int priority
+RTEMS_INLINE_ROUTINE int _POSIX_Priority_From_core(
+  const Scheduler_Control *scheduler,
+  Priority_Control         priority
 )
 {
-  return (Priority_Control) (POSIX_SCHEDULER_MAXIMUM_PRIORITY - priority + 1);
-}
-
-/**
- * @brief Convert SuperCore priority To POSIX priority.
- *
- * This method converts a SuperCore priority into onto the corresponding
- * POSIX API value.
- *
- * @param[in] priority is the POSIX API priority.
- *
- * @return This method returns the corresponding POSIX priority.
- */
-RTEMS_INLINE_ROUTINE int _POSIX_Priority_From_core(
-  Priority_Control priority
-)
-{
-  return (POSIX_SCHEDULER_MAXIMUM_PRIORITY - priority + 1);
+  return (int) ( scheduler->maximum_priority - priority );
 }
 

cpukit/posix/src/mutexgetprioceiling.c

@@ -47 +47 @@
 
   *prioceiling = _POSIX_Priority_From_core(
+    &_Scheduler_Table[ 0 ],
     the_mutex->Mutex.priority_ceiling
   );

cpukit/posix/src/mutexinit.c

@@ -21 +21 @@
 #include <rtems/posix/muteximpl.h>
 #include <rtems/posix/priorityimpl.h>
+#include <rtems/score/schedulerimpl.h>
 
 /**
@@ -116 +117 @@
     }
 
-    if ( !_POSIX_Priority_Is_valid( prio_ceiling ) ) {
+    if ( !_POSIX_Priority_Is_valid( scheduler, prio_ceiling ) ) {
       return EINVAL;
     }
 
-    priority = _POSIX_Priority_To_core( prio_ceiling );
+    priority = _POSIX_Priority_To_core( scheduler, prio_ceiling );
   }
 

cpukit/posix/src/mutexsetprioceiling.c

@@ -32 +32 @@
 )
 {
-  register POSIX_Mutex_Control *the_mutex;
-  Priority_Control              the_priority;
-  int                           error;
+  POSIX_Mutex_Control     *the_mutex;
+  const Scheduler_Control *scheduler;
+  int                      error;
+  int                      unlock_error;
 
   if ( !old_ceiling )
     return EINVAL;
-
-  if ( !_POSIX_Priority_Is_valid( prioceiling ) )
-    return EINVAL;
-
-  the_priority = _POSIX_Priority_To_core( prioceiling );
 
   /*
@@ -57 +53 @@
   _Assert( the_mutex != NULL );
 
+  scheduler = &_Scheduler_Table[ 0 ];
+
   *old_ceiling = _POSIX_Priority_From_core(
+    scheduler,
     the_mutex->Mutex.priority_ceiling
   );
-  the_mutex->Mutex.priority_ceiling = the_priority;
 
-  error = pthread_mutex_unlock( mutex );
-  _Assert( error == 0 );
-  (void) error;
-  return 0;
+  if ( _POSIX_Priority_Is_valid( scheduler, prioceiling ) ) {
+    Priority_Control priority;
+
+    priority = _POSIX_Priority_To_core( scheduler, prioceiling );
+    the_mutex->Mutex.priority_ceiling = priority;
+
+    error = 0;
+  } else {
+    error = EINVAL;
+  }
+
+  unlock_error = pthread_mutex_unlock( mutex );
+  _Assert( unlock_error == 0 );
+  (void) unlock_error;
+  return error;
 }

cpukit/posix/src/psxpriorityisvalid.c

@@ -31 +31 @@
 
 bool _POSIX_Priority_Is_valid(
-  int priority
+  const Scheduler_Control *scheduler,
+  int                      priority
 )
 {
-  return ((priority >= POSIX_SCHEDULER_MINIMUM_PRIORITY) &&
-          (priority <= POSIX_SCHEDULER_MAXIMUM_PRIORITY));
-
+  return priority >= POSIX_SCHEDULER_MINIMUM_PRIORITY
+    && (Priority_Control) priority < scheduler->maximum_priority;
 }
 

cpukit/posix/src/pthread.c

@@ -38 +38 @@
 #include <rtems/posix/config.h>
 #include <rtems/posix/keyimpl.h>
+#include <rtems/score/assert.h>
 #include <rtems/score/cpusetimpl.h>
-#include <rtems/score/assert.h>
+#include <rtems/score/schedulerimpl.h>
 
 Thread_Information _POSIX_Threads_Information;
@@ -183 +184 @@
   _POSIX_Threads_Initialize_attributes( &api->Attributes );
   api->Attributes.schedparam.sched_priority = _POSIX_Priority_From_core(
+    _Scheduler_Get_own( created ),
     created->current_priority
   );

cpukit/posix/src/pthreadcreate.c

@@ -71 +71 @@
   Thread_Control                     *the_thread;
   Thread_Control                     *executing;
+  const Scheduler_Control            *scheduler;
   POSIX_API_Control                  *api;
   int                                 schedpolicy = SCHED_RR;
@@ -152 +153 @@
   }
 
-  if ( !_POSIX_Priority_Is_valid( low_prio ) ) {
-    return EINVAL;
-  }
-
-  if ( !_POSIX_Priority_Is_valid( high_prio ) ) {
-    return EINVAL;
-  }
-
-  core_low_prio = _POSIX_Priority_To_core( low_prio );
-  core_high_prio = _POSIX_Priority_To_core( high_prio );
+  scheduler = _Scheduler_Get_own( executing );
+
+  if ( !_POSIX_Priority_Is_valid( scheduler, low_prio ) ) {
+    return EINVAL;
+  }
+
+  if ( !_POSIX_Priority_Is_valid( scheduler, high_prio ) ) {
+    return EINVAL;
+  }
+
+  core_low_prio = _POSIX_Priority_To_core( scheduler, low_prio );
+  core_high_prio = _POSIX_Priority_To_core( scheduler, high_prio );
 
 #if defined(RTEMS_SMP)

cpukit/posix/src/pthreadgetschedparam.c

@@ -27 +27 @@
 #include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/priorityimpl.h>
+#include <rtems/score/schedulerimpl.h>
 #include <rtems/score/threadimpl.h>
 
@@ -35 +36 @@
 )
 {
-  Thread_Control    *the_thread;
-  ISR_lock_Context   lock_context;
-  POSIX_API_Control *api;
+  Thread_Control          *the_thread;
+  ISR_lock_Context         lock_context;
+  POSIX_API_Control       *api;
+  const Scheduler_Control *scheduler;
+  Priority_Control         priority;
 
   if ( policy == NULL || param == NULL ) {
@@ -55 +58 @@
   *policy = api->Attributes.schedpolicy;
   *param  = api->Attributes.schedparam;
-  param->sched_priority = _POSIX_Priority_From_core(
-    the_thread->real_priority
-  );
+
+  scheduler = _Scheduler_Get_own( the_thread );
+  priority = the_thread->real_priority;
 
   _Thread_Lock_release_default( the_thread, &lock_context );
+
+  param->sched_priority = _POSIX_Priority_From_core( scheduler, priority );
   return 0;
 }

cpukit/posix/src/pthreadsetschedparam.c

@@ -29 +29 @@
 #include <rtems/posix/priorityimpl.h>
 #include <rtems/score/threadimpl.h>
+#include <rtems/score/schedulerimpl.h>
 
 typedef struct {
@@ -46 +47 @@
   POSIX_Set_sched_param_context *context;
   const struct sched_param      *param;
+  const Scheduler_Control       *scheduler;
   POSIX_API_Control             *api;
   int                            low_prio;
@@ -55 +57 @@
   context = arg;
   param = context->param;
+  scheduler = _Scheduler_Get_own( the_thread );
 
   if ( context->policy == SCHED_SPORADIC ) {
@@ -64 +67 @@
   }
 
-  if ( !_POSIX_Priority_Is_valid( low_prio ) ) {
+  if ( !_POSIX_Priority_Is_valid( scheduler, low_prio ) ) {
     context->error = EINVAL;
     return false;
   }
 
-  if ( !_POSIX_Priority_Is_valid( high_prio ) ) {
+  if ( !_POSIX_Priority_Is_valid( scheduler, high_prio ) ) {
     context->error = EINVAL;
     return false;
   }
 
-  core_low_prio = _POSIX_Priority_To_core( low_prio );
-  core_high_prio = _POSIX_Priority_To_core( high_prio );
+  core_low_prio = _POSIX_Priority_To_core( scheduler, low_prio );
+  core_high_prio = _POSIX_Priority_To_core( scheduler, high_prio );
 
   *new_priority_p = core_high_prio;

cpukit/posix/src/pthreadsetschedprio.c

@@ -17 +17 @@
 #include <rtems/posix/threadsup.h>
 #include <rtems/score/threadimpl.h>
+#include <rtems/score/schedulerimpl.h>
 
 typedef struct {
@@ -31 +32 @@
   POSIX_Set_sched_prio_context *context;
   int                           prio;
+  const Scheduler_Control      *scheduler;
   POSIX_API_Control            *api;
   Priority_Control              current_priority;
@@ -37 +39 @@
   context = arg;
   prio = context->prio;
+  scheduler = _Scheduler_Get_own( the_thread );
 
-  if ( !_POSIX_Priority_Is_valid( prio ) ) {
+  if ( !_POSIX_Priority_Is_valid( scheduler, prio ) ) {
     context->error = EINVAL;
     return false;
   }
 
-  new_priority = _POSIX_Priority_To_core( prio );
+  new_priority = _POSIX_Priority_To_core( scheduler, prio );
   *new_priority_p = new_priority;