Rename _CORE_barrier_Wait() into _CORE_barrier_Seize(). Rename
_CORE_barrier_Release() into _CORE_barrier_Surrender(). This avoids
confusion with the ISR lock acquire and release.
---
cpukit/posix/src/pbarrierwait.c | 2 +-
cpukit/rtems/src/barrierrelease.c | 2 +-
cpukit/rtems/src/barrierwait.c | 2 +-
cpukit/score/include/rtems/score/corebarrierimpl.h | 20 ++++++++++----------
cpukit/score/src/corebarrierrelease.c | 2 +-
cpukit/score/src/corebarrierwait.c | 4 ++--
6 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/cpukit/posix/src/pbarrierwait.c b/cpukit/posix/src/pbarrierwait.c
index fd94e45..86bfba7 100644
--- a/cpukit/posix/src/pbarrierwait.c
+++ b/cpukit/posix/src/pbarrierwait.c
@@ -52,7 +52,7 @@ int pthread_barrier_wait(
case OBJECTS_LOCAL:
executing = _Thread_Executing;
- _CORE_barrier_Wait(
+ _CORE_barrier_Seize(
&the_barrier->Barrier,
executing,
true,
diff --git a/cpukit/rtems/src/barrierrelease.c
b/cpukit/rtems/src/barrierrelease.c
index 02500e5..77937b3 100644
--- a/cpukit/rtems/src/barrierrelease.c
+++ b/cpukit/rtems/src/barrierrelease.c
@@ -54,7 +54,7 @@ rtems_status_code rtems_barrier_release(
switch ( location ) {
case OBJECTS_LOCAL:
- *released = _CORE_barrier_Release( &the_barrier->Barrier, NULL, 0 );
+ *released = _CORE_barrier_Surrender( &the_barrier->Barrier, NULL, 0 );
_Objects_Put( &the_barrier->Object );
return RTEMS_SUCCESSFUL;
diff --git a/cpukit/rtems/src/barrierwait.c b/cpukit/rtems/src/barrierwait.c
index b2999eb..f8f9ac3 100644
--- a/cpukit/rtems/src/barrierwait.c
+++ b/cpukit/rtems/src/barrierwait.c
@@ -40,7 +40,7 @@ rtems_status_code rtems_barrier_wait(
case OBJECTS_LOCAL:
executing = _Thread_Executing;
- _CORE_barrier_Wait(
+ _CORE_barrier_Seize(
&the_barrier->Barrier,
executing,
true,
diff --git a/cpukit/score/include/rtems/score/corebarrierimpl.h
b/cpukit/score/include/rtems/score/corebarrierimpl.h
index 8e923df..239bd9d 100644
--- a/cpukit/score/include/rtems/score/corebarrierimpl.h
+++ b/cpukit/score/include/rtems/score/corebarrierimpl.h
@@ -84,7 +84,7 @@ RTEMS_INLINE_ROUTINE void _CORE_barrier_Destroy(
_Thread_queue_Destroy( &the_barrier->Wait_queue );
}
-void _CORE_barrier_Do_wait(
+void _CORE_barrier_Do_seize(
CORE_barrier_Control *the_barrier,
Thread_Control *executing,
bool wait,
@@ -116,7 +116,7 @@ void _CORE_barrier_Do_wait(
* @note Status is returned via the thread control block.
*/
#if defined(RTEMS_MULTIPROCESSING)
- #define _CORE_barrier_Wait( \
+ #define _CORE_barrier_Seize( \
the_barrier, \
executing, \
wait, \
@@ -124,7 +124,7 @@ void _CORE_barrier_Do_wait(
mp_callout, \
mp_id \
) \
- _CORE_barrier_Do_wait( \
+ _CORE_barrier_Do_seize( \
the_barrier, \
executing, \
wait, \
@@ -133,7 +133,7 @@ void _CORE_barrier_Do_wait(
mp_id \
)
#else
- #define _CORE_barrier_Wait( \
+ #define _CORE_barrier_Seize( \
the_barrier, \
executing, \
wait, \
@@ -141,7 +141,7 @@ void _CORE_barrier_Do_wait(
mp_callout, \
mp_id \
) \
- _CORE_barrier_Do_wait( \
+ _CORE_barrier_Do_seize( \
the_barrier, \
executing, \
wait, \
@@ -149,7 +149,7 @@ void _CORE_barrier_Do_wait(
)
#endif
-uint32_t _CORE_barrier_Do_release(
+uint32_t _CORE_barrier_Do_surrender(
CORE_barrier_Control *the_barrier
#if defined(RTEMS_MULTIPROCESSING)
,
@@ -172,23 +172,23 @@ uint32_t _CORE_barrier_Do_release(
* @retval the number of unblocked threads
*/
#if defined(RTEMS_MULTIPROCESSING)
- #define _CORE_barrier_Release( \
+ #define _CORE_barrier_Surrender( \
the_barrier, \
mp_callout, \
mp_id \
) \
- _CORE_barrier_Do_release( \
+ _CORE_barrier_Do_surrender( \
the_barrier, \
mp_callout, \
mp_id \
)
#else
- #define _CORE_barrier_Release( \
+ #define _CORE_barrier_Surrender( \
the_barrier, \
mp_callout, \
mp_id \
) \
- _CORE_barrier_Do_release( \
+ _CORE_barrier_Do_surrender( \
the_barrier \
)
#endif
diff --git a/cpukit/score/src/corebarrierrelease.c
b/cpukit/score/src/corebarrierrelease.c
index 4458064..6d72203 100644
--- a/cpukit/score/src/corebarrierrelease.c
+++ b/cpukit/score/src/corebarrierrelease.c
@@ -23,7 +23,7 @@
#include <rtems/score/objectimpl.h>
#include <rtems/score/threadqimpl.h>
-uint32_t _CORE_barrier_Do_release(
+uint32_t _CORE_barrier_Do_surrender(
CORE_barrier_Control *the_barrier
#if defined(RTEMS_MULTIPROCESSING)
,
diff --git a/cpukit/score/src/corebarrierwait.c
b/cpukit/score/src/corebarrierwait.c
index 689ead0..11495e5 100644
--- a/cpukit/score/src/corebarrierwait.c
+++ b/cpukit/score/src/corebarrierwait.c
@@ -23,7 +23,7 @@
#include <rtems/score/statesimpl.h>
#include <rtems/score/threadqimpl.h>
-void _CORE_barrier_Do_wait(
+void _CORE_barrier_Do_seize(
CORE_barrier_Control *the_barrier,
Thread_Control *executing,
bool wait,
@@ -45,7 +45,7 @@ void _CORE_barrier_Do_wait(
the_barrier->Attributes.maximum_count) {
executing->Wait.return_code = CORE_BARRIER_STATUS_AUTOMATICALLY_RELEASED;
_Thread_queue_Release( &the_barrier->Wait_queue, &lock_context );
- _CORE_barrier_Release( the_barrier, mp_callout, mp_id );
+ _CORE_barrier_Surrender( the_barrier, mp_callout, mp_id );
return;
}
}
--
1.8.4.5
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
