Changeset ce6e9ec2 in rtems

Timestamp:

06/14/16 04:50:38 (7 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

2df7fcf

Parents:

655ce0fb

git-author:

Sebastian Huber <sebastian.huber@…> (06/14/16 04:50:38)

git-committer:

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

Message:

posix: pthread_mutexattr_setprioceiling()

Accept all priority values in pthread_mutexattr_setprioceiling(). This
is in line with POSIX and FreeBSD. The priority is validated in
pthread_mutex_init(). Validate the priority only for priority ceiling
mutexes.

Files:

• cpukit/posix/src/mutexattrsetprioceiling.c (modified) (2 diffs)
• cpukit/posix/src/mutexinit.c (modified) (4 diffs)
• testsuites/psxtests/psx05/init.c (modified) (3 diffs)
• testsuites/psxtests/psx05/psx05.scn (modified) (6 diffs)

cpukit/posix/src/mutexattrsetprioceiling.c

@@ -22 +22 @@
 #include <pthread.h>
 
-#include <rtems/system.h>
-#include <rtems/score/coremuteximpl.h>
-#include <rtems/score/watchdog.h>
-#include <rtems/posix/muteximpl.h>
-#include <rtems/posix/priorityimpl.h>
-
 /*
  *  13.6.1 Mutex Initialization Scheduling Attributes, P1003.1c/Draft 10, p. 128
@@ -40 +34 @@
     return EINVAL;
 
-  if ( !_POSIX_Priority_Is_valid( prioceiling ) )
-    return EINVAL;
-
   attr->prio_ceiling = prioceiling;
   return 0;

cpukit/posix/src/mutexinit.c

@@ -37 +37 @@
   const pthread_mutexattr_t *the_attr;
   POSIX_Mutex_Protocol       protocol;
+  Priority_Control           priority;
 
   if ( attr ) the_attr = attr;
@@ -87 +88 @@
   }
 
-  /*
-   *  Validate the priority ceiling field -- should always be valid.
-   */
-  if ( !_POSIX_Priority_Is_valid( the_attr->prio_ceiling ) )
-    return EINVAL;
-
 #if defined(_UNIX98_THREAD_MUTEX_ATTRIBUTES)
   /*
@@ -110 +105 @@
 #endif
 
+  if ( protocol == POSIX_MUTEX_PRIORITY_CEILING ) {
+    if ( !_POSIX_Priority_Is_valid( the_attr->prio_ceiling ) ) {
+      return EINVAL;
+    }
+
+    priority = _POSIX_Priority_To_core( the_attr->prio_ceiling );
+  }
+
   the_mutex = _POSIX_Mutex_Allocate();
 
@@ -120 +123 @@
   the_mutex->is_recursive = ( the_attr->type == PTHREAD_MUTEX_RECURSIVE );
 
-  switch ( the_mutex->protocol ) {
+  switch ( protocol ) {
     case POSIX_MUTEX_PRIORITY_CEILING:
       _CORE_ceiling_mutex_Initialize(
         &the_mutex->Mutex,
-        _POSIX_Priority_To_core( the_attr->prio_ceiling )
+        priority
       );
       break;

testsuites/psxtests/psx05/init.c

@@ -17 +17 @@
 #include "system.h"
 #include <errno.h>
+#include <limits.h>
 
 #include <rtems/score/todimpl.h>
@@ -376 +377 @@
   rtems_test_assert( status == EINVAL );
 
-  puts( "Init: pthread_mutexattr_setprioceiling - EINVAL (invalid priority)" );
-  status = pthread_mutexattr_setprioceiling( &attr, 512 );
-  if ( status != EINVAL )
-    printf( "status = %d\n", status );
-  rtems_test_assert( status == EINVAL );
+  puts( "Init: pthread_mutexattr_setprioceiling - SUCCESSFUL (priority INT_MAX)" );
+  status = pthread_mutexattr_setprioceiling( &attr, INT_MAX );
+  rtems_test_assert( status == 0 );
+
+  puts( "Init: pthread_mutexattr_setprioceiling - SUCCESSFUL (priority INT_MIN)" );
+  status = pthread_mutexattr_setprioceiling( &attr, INT_MIN );
+  rtems_test_assert( status == 0 );
 
   puts( "Init: pthread_mutexattr_setprioceiling - EINVAL (not initialized)" );
@@ -410 +413 @@
   rtems_test_assert( status == EINVAL );
 
-  /* must get around error checks in attribute set routines */
-  attr.protocol = PTHREAD_PRIO_INHERIT;
-  attr.prio_ceiling = -1;
+  puts( "Init: pthread_mutexattr_setprotocol - SUCCESSFUL" );
+  status = pthread_mutexattr_setprotocol( &attr, PTHREAD_PRIO_PROTECT );
+  rtems_test_assert( !status );
+
+  puts( "Init: pthread_mutexattr_setprioceiling - SUCCESSFUL" );
+  status = pthread_mutexattr_setprioceiling( &attr, -1 );
+  rtems_test_assert( !status );
 
   puts( "Init: pthread_mutex_init - EINVAL (bad priority ceiling)" );

testsuites/psxtests/psx05/psx05.scn

@@ -1 @@
-*** POSIX TEST 5 ***
+*** BEGIN OF TEST PSX 5 ***
 Init's ID is 0x0b010001
 Init: pthread_mutexattr_init - EINVAL (NULL attr)
@@ -27 +27 @@
 Init: pthread_mutexattr_getprioceiling - EINVAL (not initialized)
 Init: pthread_mutexattr_setprioceiling - EINVAL (NULL attr)
-Init: pthread_mutexattr_setprioceiling - EINVAL (invalid priority)
+Init: pthread_mutexattr_setprioceiling - SUCCESSFUL (priority INT_MAX)
+Init: pthread_mutexattr_setprioceiling - SUCCESSFUL (priority INT_MIN)
 Init: pthread_mutexattr_setprioceiling - EINVAL (not initialized)
 
@@ -33 +34 @@
 Init: pthread_mutex_init - EINVAL (not initialized attr)
 Init: pthread_mutex_init - EINVAL (bad protocol)
+Init: pthread_mutexattr_setprotocol - SUCCESSFUL
+Init: pthread_mutexattr_setprioceiling - SUCCESSFUL
 Init: pthread_mutex_init - EINVAL (bad priority ceiling)
 Init: Resetting mutex attributes
@@ -83 +86 @@
 Init: pthread_setschedparam - Setting Task2 priority to highest
 Task 2: pthread_mutex_lock unavailable (inherit case)
-Init: pthread_getschedparam - priority = 254
+Init: pthread_getschedparam - priority = 2
 Init: pthread_mutex_unlock - SUCCESSFUL
 Task 2: mutex acquired
@@ -104 +107 @@
 Init: pthread_getschedparam - priority = 2
 Init: pthread_mutex_trylock - SUCCESSFUL
-Init: pthread_getschedparam - priority = 200
+Init: pthread_getschedparam - priority = 2
 Init: pthread_setschedparam - set Task3 priority to highest
 Init: Sleep 1 second
@@ -117 +120 @@
 Init: pthread_mutex_lock - EINVAL (priority ceiling violation)
 Init: Recursive Mutex
-*** END OF POSIX TEST 5 ***
+*** END OF TEST PSX 5 ***