Rename _CORE_RWLock_Obtain_for_reading() into
_CORE_RWLock_Seize_for_reading(). Rename
_CORE_RWLock_Obtain_for_writing() into _CORE_RWLock_Seize_for_writing().
Rename _CORE_RWLock_Release() into _CORE_RWLock_Surrender(). This
avoids confusion with the ISR lock acquire and release.
---
cpukit/posix/src/prwlockrdlock.c | 2 +-
cpukit/posix/src/prwlocktimedrdlock.c | 2 +-
cpukit/posix/src/prwlocktimedwrlock.c | 2 +-
cpukit/posix/src/prwlocktryrdlock.c | 2 +-
cpukit/posix/src/prwlocktrywrlock.c | 2 +-
cpukit/posix/src/prwlockunlock.c | 2 +-
cpukit/posix/src/prwlockwrlock.c | 2 +-
cpukit/score/include/rtems/score/corerwlockimpl.h | 6 +++---
cpukit/score/src/corerwlockobtainread.c | 2 +-
cpukit/score/src/corerwlockobtainwrite.c | 2 +-
cpukit/score/src/corerwlockrelease.c | 2 +-
11 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/cpukit/posix/src/prwlockrdlock.c b/cpukit/posix/src/prwlockrdlock.c
index c6bf5fc..7d1bcaa 100644
--- a/cpukit/posix/src/prwlockrdlock.c
+++ b/cpukit/posix/src/prwlockrdlock.c
@@ -47,7 +47,7 @@ int pthread_rwlock_rdlock(
case OBJECTS_LOCAL:
executing = _Thread_Executing;
- _CORE_RWLock_Obtain_for_reading(
+ _CORE_RWLock_Seize_for_reading(
&the_rwlock->RWLock,
executing,
true, /* we are willing to wait forever */
diff --git a/cpukit/posix/src/prwlocktimedrdlock.c
b/cpukit/posix/src/prwlocktimedrdlock.c
index b94fe1b..0f2878b 100644
--- a/cpukit/posix/src/prwlocktimedrdlock.c
+++ b/cpukit/posix/src/prwlocktimedrdlock.c
@@ -73,7 +73,7 @@ int pthread_rwlock_timedrdlock(
case OBJECTS_LOCAL:
executing = _Thread_Executing;
- _CORE_RWLock_Obtain_for_reading(
+ _CORE_RWLock_Seize_for_reading(
&the_rwlock->RWLock,
executing,
do_wait,
diff --git a/cpukit/posix/src/prwlocktimedwrlock.c
b/cpukit/posix/src/prwlocktimedwrlock.c
index 42a8068..51558de 100644
--- a/cpukit/posix/src/prwlocktimedwrlock.c
+++ b/cpukit/posix/src/prwlocktimedwrlock.c
@@ -75,7 +75,7 @@ int pthread_rwlock_timedwrlock(
case OBJECTS_LOCAL:
executing = _Thread_Executing;
- _CORE_RWLock_Obtain_for_writing(
+ _CORE_RWLock_Seize_for_writing(
&the_rwlock->RWLock,
executing,
do_wait,
diff --git a/cpukit/posix/src/prwlocktryrdlock.c
b/cpukit/posix/src/prwlocktryrdlock.c
index 72413e4..642ed86 100644
--- a/cpukit/posix/src/prwlocktryrdlock.c
+++ b/cpukit/posix/src/prwlocktryrdlock.c
@@ -51,7 +51,7 @@ int pthread_rwlock_tryrdlock(
case OBJECTS_LOCAL:
executing = _Thread_Executing;
- _CORE_RWLock_Obtain_for_reading(
+ _CORE_RWLock_Seize_for_reading(
&the_rwlock->RWLock,
executing,
false, /* do not wait for the rwlock */
diff --git a/cpukit/posix/src/prwlocktrywrlock.c
b/cpukit/posix/src/prwlocktrywrlock.c
index 23f7d80..065199b 100644
--- a/cpukit/posix/src/prwlocktrywrlock.c
+++ b/cpukit/posix/src/prwlocktrywrlock.c
@@ -51,7 +51,7 @@ int pthread_rwlock_trywrlock(
case OBJECTS_LOCAL:
executing = _Thread_Executing;
- _CORE_RWLock_Obtain_for_writing(
+ _CORE_RWLock_Seize_for_writing(
&the_rwlock->RWLock,
executing,
false, /* we are not willing to wait */
diff --git a/cpukit/posix/src/prwlockunlock.c b/cpukit/posix/src/prwlockunlock.c
index 9b61a5c..5dc7099 100644
--- a/cpukit/posix/src/prwlockunlock.c
+++ b/cpukit/posix/src/prwlockunlock.c
@@ -51,7 +51,7 @@ int pthread_rwlock_unlock(
switch ( location ) {
case OBJECTS_LOCAL:
- status = _CORE_RWLock_Release( &the_rwlock->RWLock, _Thread_Executing );
+ status = _CORE_RWLock_Surrender( &the_rwlock->RWLock, _Thread_Executing
);
_Objects_Put( &the_rwlock->Object );
return _POSIX_RWLock_Translate_core_RWLock_return_code( status );
diff --git a/cpukit/posix/src/prwlockwrlock.c b/cpukit/posix/src/prwlockwrlock.c
index 49bc114..aa35a2c 100644
--- a/cpukit/posix/src/prwlockwrlock.c
+++ b/cpukit/posix/src/prwlockwrlock.c
@@ -55,7 +55,7 @@ int pthread_rwlock_wrlock(
case OBJECTS_LOCAL:
executing = _Thread_Executing;
- _CORE_RWLock_Obtain_for_writing(
+ _CORE_RWLock_Seize_for_writing(
&the_rwlock->RWLock,
executing,
true, /* do not timeout -- wait forever */
diff --git a/cpukit/score/include/rtems/score/corerwlockimpl.h
b/cpukit/score/include/rtems/score/corerwlockimpl.h
index a8e890f..e727ad6 100644
--- a/cpukit/score/include/rtems/score/corerwlockimpl.h
+++ b/cpukit/score/include/rtems/score/corerwlockimpl.h
@@ -99,7 +99,7 @@ RTEMS_INLINE_ROUTINE void _CORE_RWLock_Destroy(
* @note Status is returned via the thread control block.
*/
-void _CORE_RWLock_Obtain_for_reading(
+void _CORE_RWLock_Seize_for_reading(
CORE_RWLock_Control *the_rwlock,
Thread_Control *executing,
bool wait,
@@ -118,7 +118,7 @@ void _CORE_RWLock_Obtain_for_reading(
*
* @note Status is returned via the thread control block.
*/
-void _CORE_RWLock_Obtain_for_writing(
+void _CORE_RWLock_Seize_for_writing(
CORE_RWLock_Control *the_rwlock,
Thread_Control *executing,
bool wait,
@@ -135,7 +135,7 @@ void _CORE_RWLock_Obtain_for_writing(
*
* @retval Status is returned to indicate successful or failure.
*/
-CORE_RWLock_Status _CORE_RWLock_Release(
+CORE_RWLock_Status _CORE_RWLock_Surrender(
CORE_RWLock_Control *the_rwlock,
Thread_Control *executing
);
diff --git a/cpukit/score/src/corerwlockobtainread.c
b/cpukit/score/src/corerwlockobtainread.c
index 71cdf26..3d37571 100644
--- a/cpukit/score/src/corerwlockobtainread.c
+++ b/cpukit/score/src/corerwlockobtainread.c
@@ -23,7 +23,7 @@
#include <rtems/score/statesimpl.h>
#include <rtems/score/watchdog.h>
-void _CORE_RWLock_Obtain_for_reading(
+void _CORE_RWLock_Seize_for_reading(
CORE_RWLock_Control *the_rwlock,
Thread_Control *executing,
bool wait,
diff --git a/cpukit/score/src/corerwlockobtainwrite.c
b/cpukit/score/src/corerwlockobtainwrite.c
index 3ae1826..07fe03a 100644
--- a/cpukit/score/src/corerwlockobtainwrite.c
+++ b/cpukit/score/src/corerwlockobtainwrite.c
@@ -23,7 +23,7 @@
#include <rtems/score/statesimpl.h>
#include <rtems/score/watchdog.h>
-void _CORE_RWLock_Obtain_for_writing(
+void _CORE_RWLock_Seize_for_writing(
CORE_RWLock_Control *the_rwlock,
Thread_Control *executing,
bool wait,
diff --git a/cpukit/score/src/corerwlockrelease.c
b/cpukit/score/src/corerwlockrelease.c
index 142ae65..d8180fc 100644
--- a/cpukit/score/src/corerwlockrelease.c
+++ b/cpukit/score/src/corerwlockrelease.c
@@ -24,7 +24,7 @@
#include <rtems/score/threadqimpl.h>
#include <rtems/score/watchdog.h>
-CORE_RWLock_Status _CORE_RWLock_Release(
+CORE_RWLock_Status _CORE_RWLock_Surrender(
CORE_RWLock_Control *the_rwlock,
Thread_Control *executing
)
--
1.8.4.5
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
