score: Remove _CORE_barrier_Do_flush()

Call _Thread_queue_Flush_critical() directly.
This commit is contained in:
Sebastian Huber
2021-02-21 10:58:15 +01:00
parent 3cbdf19eac
commit 88543adeb5
4 changed files with 6 additions and 56 deletions

View File

@@ -833,7 +833,6 @@ librtemscpu_a_SOURCES += score/src/apimutexisowner.c
librtemscpu_a_SOURCES += score/src/apimutexlock.c
librtemscpu_a_SOURCES += score/src/apimutexunlock.c
librtemscpu_a_SOURCES += score/src/corebarrier.c
librtemscpu_a_SOURCES += score/src/corebarrierrelease.c
librtemscpu_a_SOURCES += score/src/corebarrierwait.c
librtemscpu_a_SOURCES += score/src/coremsg.c
librtemscpu_a_SOURCES += score/src/coremsgbroadcast.c

View File

@@ -127,19 +127,6 @@ Status_Control _CORE_barrier_Seize(
Thread_queue_Context *queue_context
);
/**
* @brief Flushes the barrier.
*
* @param[in, out] the_barrier The barrier to flush.
* @param[out] filter The filter for flushing.
* @param[out] queue_context The thread queue context.
*/
uint32_t _CORE_barrier_Do_flush(
CORE_barrier_Control *the_barrier,
Thread_queue_Flush_filter filter,
Thread_queue_Context *queue_context
);
/**
* @brief Manually releases the barrier.
*
@@ -156,8 +143,9 @@ RTEMS_INLINE_ROUTINE uint32_t _CORE_barrier_Surrender(
Thread_queue_Context *queue_context
)
{
return _CORE_barrier_Do_flush(
the_barrier,
return _Thread_queue_Flush_critical(
&the_barrier->Wait_queue.Queue,
&_CORE_barrier_Thread_queue_operations,
_Thread_queue_Flush_default_filter,
queue_context
);
@@ -174,8 +162,9 @@ RTEMS_INLINE_ROUTINE void _CORE_barrier_Flush(
Thread_queue_Context *queue_context
)
{
_CORE_barrier_Do_flush(
the_barrier,
_Thread_queue_Flush_critical(
&the_barrier->Wait_queue.Queue,
&_CORE_barrier_Thread_queue_operations,
_Thread_queue_Flush_status_object_was_deleted,
queue_context
);

View File

@@ -1,37 +0,0 @@
/**
* @file
*
* @ingroup RTEMSScoreBarrier
*
* @brief This source file contains the implementation of
* _CORE_barrier_Do_flush().
*/
/*
* COPYRIGHT (c) 1989-2006.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at
* http://www.rtems.org/license/LICENSE.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <rtems/score/corebarrierimpl.h>
uint32_t _CORE_barrier_Do_flush(
CORE_barrier_Control *the_barrier,
Thread_queue_Flush_filter filter,
Thread_queue_Context *queue_context
)
{
return _Thread_queue_Flush_critical(
&the_barrier->Wait_queue.Queue,
&_CORE_barrier_Thread_queue_operations,
filter,
queue_context
);
}

View File

@@ -1371,7 +1371,6 @@ source:
- cpukit/score/src/condition.c
- cpukit/score/src/configstackspacesize.c
- cpukit/score/src/corebarrier.c
- cpukit/score/src/corebarrierrelease.c
- cpukit/score/src/corebarrierwait.c
- cpukit/score/src/coremsgbroadcast.c
- cpukit/score/src/coremsg.c