Changeset 2df7fcf in rtems

Timestamp:

06/14/16 09:45:22 (7 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

4da078a8

Parents:

ce6e9ec2

git-author:

Sebastian Huber <sebastian.huber@…> (06/14/16 09:45:22)

git-committer:

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

Message:

posix: _POSIX_Mutex_Default_attributes

Make _POSIX_Mutex_Default_attributes constant and independent of the
scheduler instance. Use INT_MAX to indicate the default ceiling
priority.

Location:

cpukit/posix

Files:

• Makefile.am (modified) (2 diffs)
• include/rtems/posix/muteximpl.h (modified) (1 diff)
• include/rtems/posix/priorityimpl.h (modified) (1 diff)
• preinstall.am (modified) (2 diffs)
• src/mutex.c (modified) (2 diffs)
• src/mutexinit.c (modified) (2 diffs)
• src/psxpriorityisvalid.c (modified) (1 diff)
• src/sched_getprioritymax.c (modified) (2 diffs)

cpukit/posix/Makefile.am

@@ -21 +21 @@
 include_rtems_posix_HEADERS += include/rtems/posix/config.h
 include_rtems_posix_HEADERS += include/rtems/posix/posixapi.h
+include_rtems_posix_HEADERS += include/rtems/posix/priorityimpl.h
 
 if HAS_PTHREADS
@@ -38 +39 @@
 include_rtems_posix_HEADERS += include/rtems/posix/mutex.h
 include_rtems_posix_HEADERS += include/rtems/posix/muteximpl.h
-include_rtems_posix_HEADERS += include/rtems/posix/priorityimpl.h
 include_rtems_posix_HEADERS += include/rtems/posix/psignal.h
 include_rtems_posix_HEADERS += include/rtems/posix/psignalimpl.h

cpukit/posix/include/rtems/posix/muteximpl.h

@@ -51 +51 @@
  *  The default mutex attributes structure.
  */
-extern pthread_mutexattr_t _POSIX_Mutex_Default_attributes;
+extern const pthread_mutexattr_t _POSIX_Mutex_Default_attributes;
 
 RTEMS_INLINE_ROUTINE void _POSIX_Mutex_Acquire_critical(

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

@@ -61 +61 @@
 
 /**
+ * @brief Gets the maximum POSIX API priority for this scheduler instance.
+ *
+ * Such a priority is valid.  A scheduler instance may support priority values
+ * that are not representable as an integer.
+ *
+ * @return The maximum POSIX API priority for this scheduler instance.
+ */
+int _POSIX_Priority_Get_maximum( const Scheduler_Control *scheduler );
+
+/**
  * @brief Check if POSIX priority is valid.
  * 

cpukit/posix/preinstall.am

@@ -44 +44 @@
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/posixapi.h
 
+$(PROJECT_INCLUDE)/rtems/posix/priorityimpl.h: include/rtems/posix/priorityimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/priorityimpl.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/priorityimpl.h
+
 if HAS_PTHREADS
 $(PROJECT_INCLUDE)/aio.h: include/aio.h $(PROJECT_INCLUDE)/$(dirstamp)
@@ -85 +89 @@
         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/muteximpl.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/muteximpl.h
-
-$(PROJECT_INCLUDE)/rtems/posix/priorityimpl.h: include/rtems/posix/priorityimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/priorityimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/priorityimpl.h
 
 $(PROJECT_INCLUDE)/rtems/posix/psignal.h: include/rtems/posix/psignal.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)

cpukit/posix/src/mutex.c

@@ -19 +19 @@
 #endif
 
-#include <errno.h>
-#include <pthread.h>
 #include <limits.h>
 
-#include <rtems/system.h>
 #include <rtems/config.h>
 #include <rtems/sysinit.h>
-#include <rtems/score/coremuteximpl.h>
-#include <rtems/score/watchdog.h>
 #include <rtems/posix/muteximpl.h>
-#include <rtems/posix/priorityimpl.h>
+#include <rtems/score/objectimpl.h>
 
 Objects_Information _POSIX_Mutex_Information;
 
-pthread_mutexattr_t _POSIX_Mutex_Default_attributes;
+const pthread_mutexattr_t _POSIX_Mutex_Default_attributes = {
+#if defined(_UNIX98_THREAD_MUTEX_ATTRIBUTES)
+  .type           = PTHREAD_MUTEX_DEFAULT,
+#endif
+  .is_initialized = true,
+  .process_shared = PTHREAD_PROCESS_PRIVATE,
+  .prio_ceiling   = INT_MAX,
+  .protocol       = PTHREAD_PRIO_NONE,
+  .recursive      = false
+};
 
 /*
@@ -48 +52 @@
 static void _POSIX_Mutex_Manager_initialization(void)
 {
-  pthread_mutexattr_t *default_attr = &_POSIX_Mutex_Default_attributes;
-
-  /*
-   * Since the maximum priority is run-time configured, this
-   * structure cannot be initialized statically.
-   */
-  default_attr->is_initialized = true;
-  default_attr->process_shared = PTHREAD_PROCESS_PRIVATE;
-  default_attr->prio_ceiling   = POSIX_SCHEDULER_MAXIMUM_PRIORITY;
-  default_attr->protocol       = PTHREAD_PRIO_NONE;
-  default_attr->recursive      = false;
-  #if defined(_UNIX98_THREAD_MUTEX_ATTRIBUTES)
-    default_attr->type         = PTHREAD_MUTEX_DEFAULT;
-  #endif
-
   /*
    * Initialize the POSIX mutex object class information structure.

cpukit/posix/src/mutexinit.c

@@ -37 +37 @@
   const pthread_mutexattr_t *the_attr;
   POSIX_Mutex_Protocol       protocol;
+  const Scheduler_Control   *scheduler;
   Priority_Control           priority;
 
@@ -106 +107 @@
 
   if ( protocol == POSIX_MUTEX_PRIORITY_CEILING ) {
-    if ( !_POSIX_Priority_Is_valid( the_attr->prio_ceiling ) ) {
+    int prio_ceiling;
+
+    scheduler = _Scheduler_Get_own( _Thread_Get_executing() );
+    prio_ceiling = the_attr->prio_ceiling;
+
+    if ( prio_ceiling == INT_MAX ) {
+      prio_ceiling = _POSIX_Priority_Get_maximum( scheduler );
+    }
+
+    if ( !_POSIX_Priority_Is_valid( prio_ceiling ) ) {
       return EINVAL;
     }
 
-    priority = _POSIX_Priority_To_core( the_attr->prio_ceiling );
+    priority = _POSIX_Priority_To_core( prio_ceiling );
   }
 

cpukit/posix/src/psxpriorityisvalid.c

@@ -19 +19 @@
 #endif
 
-#include <rtems/system.h>
 #include <rtems/posix/priorityimpl.h>
+
+int _POSIX_Priority_Get_maximum( const Scheduler_Control *scheduler )
+{
+  if ( scheduler->maximum_priority < INT_MAX ) {
+    return (int) scheduler->maximum_priority - 1;
+  } else {
+    return INT_MAX;
+  }
+}
 
 bool _POSIX_Priority_Is_valid(

cpukit/posix/src/sched_getprioritymax.c

@@ -22 +22 @@
 
 #include <sched.h>
-#include <errno.h>
 
-#include <rtems/system.h>
 #include <rtems/seterr.h>
+#include <rtems/posix/priorityimpl.h>
 #include <rtems/score/schedulerimpl.h>
 
@@ -46 +45 @@
 
   scheduler = _Scheduler_Get_own( _Thread_Get_executing() );
-
-  if ( scheduler->maximum_priority > INT_MAX ) {
-    return INT_MAX;
-  }
-
-  return (int) scheduler->maximum_priority - 1;
+  return _POSIX_Priority_Get_maximum( scheduler );
 }