score: Avoid Giant lock for CORE rwlock

Update #2555.

1 files changed, 34 insertions, 53 deletions

diff --git a/cpukit/posix/src/prwlocktimedwrlock.c b/cpukit/posix/src/prwlocktimedwrlock.c
index 51558de5f8..1258c2bebb 100644
--- a/cpukit/posix/src/prwlocktimedwrlock.c
+++ b/cpukit/posix/src/prwlocktimedwrlock.c
@@ -20,37 +20,20 @@
 #include "config.h"
 #endif
 
-#include <pthread.h>
-#include <errno.h>
-
 #include <rtems/posix/rwlockimpl.h>
-#include <rtems/score/thread.h>
 #include <rtems/score/todimpl.h>
 
-/*
- *  pthread_rwlock_timedwrlock
- *
- *  This directive attempts to obtain a write only lock on an rwlock instance.
- *
- *  Input parameters:
- *    rwlock          - pointer to rwlock id
- *
- *  Output parameters:
- *    0          - if successful
- *    error code - if unsuccessful
- */
-
 int pthread_rwlock_timedwrlock(
   pthread_rwlock_t      *rwlock,
   const struct timespec *abstime
 )
 {
-  POSIX_RWLock_Control                        *the_rwlock;
-  Objects_Locations                            location;
-  Watchdog_Interval                            ticks;
-  bool                                         do_wait = true;
+  POSIX_RWLock_Control                    *the_rwlock;
+  ISR_lock_Context                         lock_context;
+  Watchdog_Interval                        ticks;
+  bool                                     do_wait;
   TOD_Absolute_timeout_conversion_results  status;
-  Thread_Control                              *executing;
+  Thread_Control                          *executing;
 
   /*
    *  POSIX requires that blocking calls with timeouts that take
@@ -66,42 +49,40 @@ int pthread_rwlock_timedwrlock(
    *  then we should not wait.
    */
   status = _TOD_Absolute_timeout_to_ticks( abstime, &ticks );
-  if ( status != TOD_ABSOLUTE_TIMEOUT_IS_IN_FUTURE )
-    do_wait = false;
-
-  the_rwlock = _POSIX_RWLock_Get( rwlock, &location );
-  switch ( location ) {
+  do_wait = ( status == TOD_ABSOLUTE_TIMEOUT_IS_IN_FUTURE );
 
-    case OBJECTS_LOCAL:
+  the_rwlock = _POSIX_RWLock_Get( rwlock, &lock_context );
 
-      executing = _Thread_Executing;
-      _CORE_RWLock_Seize_for_writing(
-        &the_rwlock->RWLock,
-        executing,
-        do_wait,
-        ticks
-      );
+  if ( the_rwlock == NULL ) {
+    return EINVAL;
+  }
 
-      _Objects_Put( &the_rwlock->Object );
-      if ( !do_wait &&
-           (executing->Wait.return_code == CORE_RWLOCK_UNAVAILABLE) ) {
-        if ( status == TOD_ABSOLUTE_TIMEOUT_INVALID )
-          return EINVAL;
-        if ( status == TOD_ABSOLUTE_TIMEOUT_IS_IN_PAST ||
-             status == TOD_ABSOLUTE_TIMEOUT_IS_NOW )
-          return ETIMEDOUT;
-      }
+  executing = _Thread_Executing;
+  _CORE_RWLock_Seize_for_writing(
+    &the_rwlock->RWLock,
+    executing,
+    do_wait,
+    ticks,
+    &lock_context
+  );
 
-      return _POSIX_RWLock_Translate_core_RWLock_return_code(
-        (CORE_RWLock_Status) executing->Wait.return_code
-      );
+  if (
+    !do_wait
+      && ( executing->Wait.return_code == CORE_RWLOCK_UNAVAILABLE )
+  ) {
+    if ( status == TOD_ABSOLUTE_TIMEOUT_INVALID ) {
+      return EINVAL;
+    }
 
-#if defined(RTEMS_MULTIPROCESSING)
-    case OBJECTS_REMOTE:
-#endif
-    case OBJECTS_ERROR:
-      break;
+    if (
+      status == TOD_ABSOLUTE_TIMEOUT_IS_IN_PAST
+        || status == TOD_ABSOLUTE_TIMEOUT_IS_NOW
+    ) {
+      return ETIMEDOUT;
+    }
   }
 
-  return EINVAL;
+  return _POSIX_RWLock_Translate_core_RWLock_return_code(
+    (CORE_RWLock_Status) executing->Wait.return_code
+  );
 }