Mirrors_Framework/rtems
1
0
Fork 0
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2026-09-21 07:46:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

score: Multiprocessor Resource Sharing Protocol

Browse Source 
Add basic support for the Multiprocessor Resource Sharing Protocol
(MrsP).

The Multiprocessor Resource Sharing Protocol (MrsP) is defined in A.
Burns and A.J.  Wellings, A Schedulability Compatible Multiprocessor
Resource Sharing Protocol - MrsP, Proceedings of the 25th Euromicro
Conference on Real-Time Systems (ECRTS 2013), July 2013.  It is a
generalization of the Priority Ceiling Protocol to SMP systems.  Each
MrsP semaphore uses a ceiling priority per scheduler instance.  These
ceiling priorities can be specified with rtems_semaphore_set_priority().
A task obtaining or owning a MrsP semaphore will execute with the
ceiling priority for its scheduler instance as specified by the MrsP
semaphore object.  Tasks waiting to get ownership of a MrsP semaphore
will not relinquish the processor voluntarily.  In case the owner of a
MrsP semaphore gets preempted it can ask all tasks waiting for this
semaphore to help out and temporarily borrow the right to execute on one
of their assigned processors.

The help out feature is not implemented with this patch.
This commit is contained in:
Sebastian Huber
2014-05-28 10:50:41 +02:00
parent 9f058fb1c2
commit 8fcafdd553
32 changed files with 2251 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpukit/rtems/Makefile.am
+1
View File
@@ -206,6 +206,7 @@ librtems_a_SOURCES += src/semrelease.c
librtems_a_SOURCES += src/semflush.c
librtems_a_SOURCES += src/semtranslatereturncode.c
librtems_a_SOURCES += src/semdata.c
librtems_a_SOURCES += src/semsetpriority.c
## EVENT_C_FILES
librtems_a_SOURCES += src/event.c
cpukit/rtems/include/rtems/rtems/attr.h
+14
View File
@@ -139,6 +139,20 @@ typedef uint32_t rtems_attribute;
*/
#define RTEMS_PRIORITY_CEILING 0x00000080
/**
* This attribute constant indicates that the Classic API Semaphore instance
* created will NOT use the Multiprocessor Resource Sharing Protocol.
*/
#define RTEMS_NO_MULTIPROCESSOR_RESOURCE_SHARING 0x00000000
/**
* This attribute constant indicates that the Classic API Semaphore instance
* created will use the Multiprocessor Resource Sharing Protocol.
*
* @note The semaphore instance must be a binary semaphore.
*/
#define RTEMS_MULTIPROCESSOR_RESOURCE_SHARING 0x00000100
/******************** RTEMS Barrier Specific Attributes ********************/
/**
cpukit/rtems/include/rtems/rtems/attrimpl.h
+31
View File
@@ -184,6 +184,23 @@ RTEMS_INLINE_ROUTINE bool _Attributes_Is_inherit_priority(
return ( attribute_set & RTEMS_INHERIT_PRIORITY ) ? true : false;
}
/**
* @brief Returns true if the attribute set has at most one protocol, and false
* otherwise.
*
* The protocols are RTEMS_INHERIT_PRIORITY, RTEMS_PRIORITY_CEILING and
* RTEMS_MULTIPROCESSOR_RESOURCE_SHARING.
*/
RTEMS_INLINE_ROUTINE bool _Attributes_Has_at_most_one_protocol(
rtems_attribute attribute_set
)
{
attribute_set &= RTEMS_INHERIT_PRIORITY | RTEMS_PRIORITY_CEILING
| RTEMS_MULTIPROCESSOR_RESOURCE_SHARING;
return ( attribute_set & ( attribute_set - 1 ) ) == 0;
}
/**
* @brief Checks if the priority ceiling attribute
* is enabled in the attribute_set
@@ -198,6 +215,20 @@ RTEMS_INLINE_ROUTINE bool _Attributes_Is_priority_ceiling(
return ( attribute_set & RTEMS_PRIORITY_CEILING ) ? true : false;
}
/**
* @brief Checks if the Multiprocessor Resource Sharing Protocol attribute
* is enabled in the attribute_set
*
* This function returns TRUE if the Multiprocessor Resource Sharing Protocol
* attribute is enabled in the attribute_set and FALSE otherwise.
*/
RTEMS_INLINE_ROUTINE bool _Attributes_Is_multiprocessor_resource_sharing(
rtems_attribute attribute_set
)
{
return ( attribute_set & RTEMS_MULTIPROCESSOR_RESOURCE_SHARING ) != 0;
}
/**
* @brief Checks if the barrier automatic release
* attribute is enabled in the attribute_set
cpukit/rtems/include/rtems/rtems/sem.h
+46
View File
@@ -38,6 +38,7 @@
#include <rtems/score/coremutex.h>
#include <rtems/score/object.h>
#include <rtems/score/coresem.h>
#include <rtems/score/mrsp.h>
#ifdef __cplusplus
extern "C" {
@@ -88,6 +89,10 @@ typedef struct {
* API Semaphore instance.
*/
CORE_semaphore_Control semaphore;
#if defined(RTEMS_SMP)
MRSP_Control mrsp;
#endif
} Core_control;
} Semaphore_Control;
@@ -208,6 +213,47 @@ rtems_status_code rtems_semaphore_flush(
rtems_id id
);
/**
* @brief Sets the priority value with respect to the specified scheduler of a
* semaphore.
*
* The special priority value @ref RTEMS_CURRENT_PRIORITY can be used to get
* the current priority value without changing it.
*
* The interpretation of the priority value depends on the protocol of the
* semaphore object.
*
* - The Multiprocessor Resource Sharing Protocol needs a ceiling priority per
* scheduler instance. This operation can be used to specify these priority
* values.
* - For the Priority Ceiling Protocol the ceiling priority is used with this
* operation.
* - For other protocols this operation is not defined.
*
* @param[in] semaphore_id Identifier of the semaphore.
* @param[in] scheduler_id Identifier of the scheduler.
* @param[in] new_priority The new priority value. Use
* @ref RTEMS_CURRENT_PRIORITY to not set a new priority and only get the
* current priority.
* @param[out] old_priority Reference to store the old priority value.
*
* @retval RTEMS_SUCCESSFUL Successful operation.
* @retval RTEMS_INVALID_ID Invalid semaphore or scheduler identifier.
* @retval RTEMS_INVALID_ADDRESS The old priority reference is @c NULL.
* @retval RTEMS_INVALID_PRIORITY The new priority value is invalid.
* @retval RTEMS_NOT_DEFINED The set priority operation is not defined for the
* protocol of this semaphore object.
* @retval RTEMS_ILLEGAL_ON_REMOTE_OBJECT Not supported for remote semaphores.
*
* @see rtems_scheduler_ident() and rtems_task_set_priority().
*/
rtems_status_code rtems_semaphore_set_priority(
rtems_id semaphore_id,
rtems_id scheduler_id,
rtems_task_priority new_priority,
rtems_task_priority *old_priority
);
/**@}*/
#ifdef __cplusplus
cpukit/rtems/include/rtems/rtems/semimpl.h
+9
View File
@@ -20,6 +20,7 @@
#include <rtems/rtems/sem.h>
#include <rtems/score/coremuteximpl.h>
#include <rtems/score/coresemimpl.h>
#include <rtems/score/mrspimpl.h>
#ifdef __cplusplus
extern "C" {
@@ -92,6 +93,14 @@ _Semaphore_Translate_core_mutex_return_code(
return _Semaphore_Translate_core_mutex_return_code_[status];
}
#if defined(RTEMS_SMP)
RTEMS_INLINE_ROUTINE rtems_status_code
_Semaphore_Translate_MRSP_status_code( MRSP_Status mrsp_status )
{
return (rtems_status_code) mrsp_status;
}
#endif
/**
* @brief Semaphore Translate Core Semaphore Return Code
*
cpukit/rtems/src/semcreate.c
+35 -3
View File
@@ -78,12 +78,19 @@ rtems_status_code rtems_semaphore_create(
return RTEMS_MP_NOT_CONFIGURED;
if ( _Attributes_Is_inherit_priority( attribute_set ) ||
_Attributes_Is_priority_ceiling( attribute_set ) )
_Attributes_Is_priority_ceiling( attribute_set ) ||
_Attributes_Is_multiprocessor_resource_sharing( attribute_set ) )
return RTEMS_NOT_DEFINED;
} else
#endif
if ( _Attributes_Is_multiprocessor_resource_sharing( attribute_set ) &&
!( _Attributes_Is_binary_semaphore( attribute_set ) &&
!_Attributes_Is_priority( attribute_set ) ) ) {
return RTEMS_NOT_DEFINED;
}
if ( _Attributes_Is_inherit_priority( attribute_set ) ||
_Attributes_Is_priority_ceiling( attribute_set ) ) {
@@ -93,13 +100,22 @@ rtems_status_code rtems_semaphore_create(
}
if ( _Attributes_Is_inherit_priority( attribute_set ) &&
_Attributes_Is_priority_ceiling( attribute_set ) )
if ( !_Attributes_Has_at_most_one_protocol( attribute_set ) )
return RTEMS_NOT_DEFINED;
if ( !_Attributes_Is_counting_semaphore( attribute_set ) && ( count > 1 ) )
return RTEMS_INVALID_NUMBER;
#if !defined(RTEMS_SMP)
/*
* On uni-processor configurations the Multiprocessor Resource Sharing
* Protocol is equivalent to the Priority Ceiling Protocol.
*/
if ( _Attributes_Is_multiprocessor_resource_sharing( attribute_set ) ) {
attribute_set |= RTEMS_PRIORITY_CEILING | RTEMS_PRIORITY;
}
#endif
the_semaphore = _Semaphore_Allocate();
if ( !the_semaphore ) {
@@ -144,6 +160,22 @@ rtems_status_code rtems_semaphore_create(
&the_semaphore_attr,
count
);
#if defined(RTEMS_SMP)
} else if ( _Attributes_Is_multiprocessor_resource_sharing( attribute_set ) ) {
MRSP_Status mrsp_status = _MRSP_Initialize(
&the_semaphore->Core_control.mrsp,
priority_ceiling,
_Thread_Get_executing(),
count != 1
);
if ( mrsp_status != MRSP_SUCCESSFUL ) {
_Semaphore_Free( the_semaphore );
_Objects_Allocator_unlock();
return _Semaphore_Translate_MRSP_status_code( mrsp_status );
}
#endif
} else {
/*
* It is either simple binary semaphore or a more powerful mutex
cpukit/rtems/src/semdelete.c
+17 -4
View File
@@ -43,6 +43,7 @@ rtems_status_code rtems_semaphore_delete(
{
Semaphore_Control *the_semaphore;
Objects_Locations location;
rtems_attribute attribute_set;
_Objects_Allocator_lock();
@@ -50,10 +51,22 @@ rtems_status_code rtems_semaphore_delete(
switch ( location ) {
case OBJECTS_LOCAL:
if ( !_Attributes_Is_counting_semaphore(the_semaphore->attribute_set) ) {
attribute_set = the_semaphore->attribute_set;
#if defined(RTEMS_SMP)
if ( _Attributes_Is_multiprocessor_resource_sharing( attribute_set ) ) {
MRSP_Status mrsp_status = _MRSP_Destroy(
&the_semaphore->Core_control.mrsp
);
if ( mrsp_status != MRSP_SUCCESSFUL ) {
_Objects_Put( &the_semaphore->Object );
_Objects_Allocator_unlock();
return _Semaphore_Translate_MRSP_status_code( mrsp_status );
}
} else
#endif
if ( !_Attributes_Is_counting_semaphore( attribute_set ) ) {
if ( _CORE_mutex_Is_locked( &the_semaphore->Core_control.mutex ) &&
!_Attributes_Is_simple_binary_semaphore(
the_semaphore->attribute_set ) ) {
!_Attributes_Is_simple_binary_semaphore( attribute_set ) ) {
_Objects_Put( &the_semaphore->Object );
_Objects_Allocator_unlock();
return RTEMS_RESOURCE_IN_USE;
@@ -74,7 +87,7 @@ rtems_status_code rtems_semaphore_delete(
_Objects_Close( &_Semaphore_Information, &the_semaphore->Object );
#if defined(RTEMS_MULTIPROCESSING)
if ( _Attributes_Is_global( the_semaphore->attribute_set ) ) {
if ( _Attributes_Is_global( attribute_set ) ) {
_Objects_MP_Close( &_Semaphore_Information, the_semaphore->Object.id );
cpukit/rtems/src/semflush.c
+9 -1
View File
@@ -43,12 +43,20 @@ rtems_status_code rtems_semaphore_flush(
{
Semaphore_Control *the_semaphore;
Objects_Locations location;
rtems_attribute attribute_set;
the_semaphore = _Semaphore_Get( id, &location );
switch ( location ) {
case OBJECTS_LOCAL:
if ( !_Attributes_Is_counting_semaphore(the_semaphore->attribute_set) ) {
attribute_set = the_semaphore->attribute_set;
#if defined(RTEMS_SMP)
if ( _Attributes_Is_multiprocessor_resource_sharing( attribute_set ) ) {
_Objects_Put( &the_semaphore->Object );
return RTEMS_NOT_DEFINED;
} else
#endif
if ( !_Attributes_Is_counting_semaphore( attribute_set ) ) {
_CORE_mutex_Flush(
&the_semaphore->Core_control.mutex,
SEND_OBJECT_WAS_DELETED,
cpukit/rtems/src/semobtain.c
+18 -1
View File
@@ -41,6 +41,7 @@ rtems_status_code rtems_semaphore_obtain(
Objects_Locations location;
ISR_Level level;
Thread_Control *executing;
rtems_attribute attribute_set;
bool wait;
the_semaphore = _Semaphore_Get_interrupt_disable( id, &location, &level );
@@ -48,8 +49,24 @@ rtems_status_code rtems_semaphore_obtain(
case OBJECTS_LOCAL:
executing = _Thread_Executing;
attribute_set = the_semaphore->attribute_set;
wait = !_Options_Is_no_wait( option_set );
if ( !_Attributes_Is_counting_semaphore(the_semaphore->attribute_set) ) {
#if defined(RTEMS_SMP)
if ( _Attributes_Is_multiprocessor_resource_sharing( attribute_set ) ) {
MRSP_Status mrsp_status;
_ISR_Enable( level );
mrsp_status = _MRSP_Obtain(
&the_semaphore->Core_control.mrsp,
executing,
wait,
timeout
);
_Objects_Put_for_get_isr_disable( &the_semaphore->Object );
return _Semaphore_Translate_MRSP_status_code( mrsp_status );
} else
#endif
if ( !_Attributes_Is_counting_semaphore( attribute_set ) ) {
_CORE_mutex_Seize(
&the_semaphore->Core_control.mutex,
executing,
cpukit/rtems/src/semrelease.c
+13 -1
View File
@@ -73,12 +73,24 @@ rtems_status_code rtems_semaphore_release(
Objects_Locations location;
CORE_mutex_Status mutex_status;
CORE_semaphore_Status semaphore_status;
rtems_attribute attribute_set;
the_semaphore = _Semaphore_Get( id, &location );
switch ( location ) {
case OBJECTS_LOCAL:
if ( !_Attributes_Is_counting_semaphore(the_semaphore->attribute_set) ) {
attribute_set = the_semaphore->attribute_set;
#if defined(RTEMS_SMP)
if ( _Attributes_Is_multiprocessor_resource_sharing( attribute_set ) ) {
MRSP_Status mrsp_status = _MRSP_Release(
&the_semaphore->Core_control.mrsp,
_Thread_Get_executing()
);
_Objects_Put( &the_semaphore->Object );
return _Semaphore_Translate_MRSP_status_code( mrsp_status );
} else
#endif
if ( !_Attributes_Is_counting_semaphore( attribute_set ) ) {
mutex_status = _CORE_mutex_Surrender(
&the_semaphore->Core_control.mutex,
id,
cpukit/rtems/src/semsetpriority.c
+116
View File
@@ -0,0 +1,116 @@
/*
* Copyright (c) 2014 embedded brains GmbH. All rights reserved.
*
* embedded brains GmbH
* Dornierstr. 4
* 82178 Puchheim
* Germany
* <rtems@embedded-brains.de>
*
* 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.
*/
#if HAVE_CONFIG_H
#include "config.h"
#endif
#include <rtems/rtems/semimpl.h>
#include <rtems/rtems/attrimpl.h>
#include <rtems/rtems/tasksimpl.h>
#include <rtems/score/schedulerimpl.h>
static rtems_status_code _Semaphore_Set_priority(
Semaphore_Control *the_semaphore,
rtems_id scheduler_id,
rtems_task_priority new_priority,
rtems_task_priority *old_priority_p
)
{
rtems_status_code sc;
rtems_attribute attribute_set = the_semaphore->attribute_set;
rtems_task_priority old_priority;
new_priority = _RTEMS_tasks_Priority_to_Core( new_priority );
#if defined(RTEMS_SMP)
if ( _Attributes_Is_multiprocessor_resource_sharing( attribute_set ) ) {
MRSP_Control *mrsp = &the_semaphore->Core_control.mrsp;
uint32_t scheduler_index = _Scheduler_Get_index_by_id( scheduler_id );
old_priority = _MRSP_Get_ceiling_priority( mrsp, scheduler_index );
if ( new_priority != RTEMS_CURRENT_PRIORITY ) {
_MRSP_Set_ceiling_priority( mrsp, scheduler_index, new_priority );
}
sc = RTEMS_SUCCESSFUL;
} else
#endif
if ( _Attributes_Is_priority_ceiling( attribute_set ) ) {
CORE_mutex_Control *mutex = &the_semaphore->Core_control.mutex;
old_priority = mutex->Attributes.priority_ceiling;
if ( new_priority != RTEMS_CURRENT_PRIORITY ) {
mutex->Attributes.priority_ceiling = new_priority;
}
sc = RTEMS_SUCCESSFUL;
} else {
old_priority = 0;
sc = RTEMS_NOT_DEFINED;
}
*old_priority_p = _RTEMS_tasks_Priority_from_Core( old_priority );
_Objects_Put( &the_semaphore->Object );
return sc;
}
rtems_status_code rtems_semaphore_set_priority(
rtems_id semaphore_id,
rtems_id scheduler_id,
rtems_task_priority new_priority,
rtems_task_priority *old_priority
)
{
Semaphore_Control *the_semaphore;
Objects_Locations location;
if ( new_priority != RTEMS_CURRENT_PRIORITY &&
!_RTEMS_tasks_Priority_is_valid( new_priority ) ) {
return RTEMS_INVALID_PRIORITY;
}
if ( old_priority == NULL ) {
return RTEMS_INVALID_ADDRESS;
}
if ( !_Scheduler_Is_id_valid( scheduler_id ) ) {
return RTEMS_INVALID_ID;
}
the_semaphore = _Semaphore_Get( semaphore_id, &location );
switch ( location ) {
case OBJECTS_LOCAL:
return _Semaphore_Set_priority(
the_semaphore,
scheduler_id,
new_priority,
old_priority
);
#if defined(RTEMS_MULTIPROCESSING)
case OBJECTS_REMOTE:
_Thread_Dispatch();
return RTEMS_ILLEGAL_ON_REMOTE_OBJECT;
#endif
case OBJECTS_ERROR:
break;
}
return RTEMS_INVALID_ID;
}
cpukit/sapi/include/confdefs.h
+13 -1
View File
@@ -1792,6 +1792,17 @@ const rtems_libio_helper rtems_fs_init_helper =
CONFIGURE_SEMAPHORES_FOR_FILE_SYSTEMS + \
CONFIGURE_NETWORKING_SEMAPHORES)
#if !defined(RTEMS_SMP) || \
!defined(CONFIGURE_MAXIMUM_MRSP_SEMAPHORES)
#define CONFIGURE_MEMORY_FOR_MRSP_SEMAPHORES 0
#else
#define CONFIGURE_MEMORY_FOR_MRSP_SEMAPHORES \
CONFIGURE_MAXIMUM_MRSP_SEMAPHORES * \
_Configure_From_workspace( \
RTEMS_ARRAY_SIZE(_Scheduler_Table) * sizeof(Priority_Control) \
)
#endif
/*
* If there are no user or support semaphores defined, then we can assume
* that no memory need be allocated at all for semaphores.
@@ -1800,7 +1811,8 @@ const rtems_libio_helper rtems_fs_init_helper =
#define CONFIGURE_MEMORY_FOR_SEMAPHORES(_semaphores) 0
#else
#define CONFIGURE_MEMORY_FOR_SEMAPHORES(_semaphores) \
_Configure_Object_RAM(_semaphores, sizeof(Semaphore_Control) )
_Configure_Object_RAM(_semaphores, sizeof(Semaphore_Control) ) + \
CONFIGURE_MEMORY_FOR_MRSP_SEMAPHORES
#endif
#ifndef CONFIGURE_MAXIMUM_MESSAGE_QUEUES
cpukit/score/Makefile.am
+2
View File
@@ -39,6 +39,8 @@ include_rtems_score_HEADERS += include/rtems/score/isr.h
include_rtems_score_HEADERS += include/rtems/score/isrlevel.h
include_rtems_score_HEADERS += include/rtems/score/isrlock.h
include_rtems_score_HEADERS += include/rtems/score/freechain.h
include_rtems_score_HEADERS += include/rtems/score/mrsp.h
include_rtems_score_HEADERS += include/rtems/score/mrspimpl.h
include_rtems_score_HEADERS += include/rtems/score/object.h
include_rtems_score_HEADERS += include/rtems/score/objectimpl.h
include_rtems_score_HEADERS += include/rtems/score/onceimpl.h
cpukit/score/include/rtems/score/mrsp.h
+133
View File
@@ -0,0 +1,133 @@
/*
* Copyright (c) 2014 embedded brains GmbH. All rights reserved.
*
* embedded brains GmbH
* Dornierstr. 4
* 82178 Puchheim
* Germany
* <rtems@embedded-brains.de>
*
* 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.
*/
#ifndef _RTEMS_SCORE_MRSP_H
#define _RTEMS_SCORE_MRSP_H
#include <rtems/score/cpuopts.h>
#if defined(RTEMS_SMP)
#include <rtems/score/atomic.h>
#include <rtems/score/chain.h>
#include <rtems/score/thread.h>
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/**
* @defgroup ScoreMRSP Multiprocessor Resource Sharing Protocol Handler
*
* @ingroup Score
*
* @brief Multiprocessor Resource Sharing Protocol (MrsP).
*
* The Multiprocessor Resource Sharing Protocol (MrsP) is defined in A. Burns
* and A.J. Wellings, A Schedulability Compatible Multiprocessor Resource
* Sharing Protocol - MrsP, Proceedings of the 25th Euromicro Conference on
* Real-Time Systems (ECRTS 2013), July 2013. It is a generalization of the
* Priority Ceiling Protocol to SMP systems. Each MrsP semaphore uses a
* ceiling priority per scheduler instance. A task obtaining or owning a MrsP
* semaphore will execute with the ceiling priority for its scheduler instance
* as specified by the MrsP semaphore object. Tasks waiting to get ownership
* of a MrsP semaphore will not relinquish the processor voluntarily. In case
* the owner of a MrsP semaphore gets preempted it can ask all tasks waiting
* for this semaphore to help out and temporarily borrow the right to execute
* on one of their assigned processors.
*
* @{
*/
/**
* @brief MrsP status code.
*
* The values are chosen to directly map to RTEMS status codes. In case this
* implementation is used for other APIs, then for example the errno values can
* be added with a bit shift.
*/
typedef enum {
MRSP_SUCCESSFUL = 0,
MRSP_TIMEOUT = 6,
MRSP_INVALID_NUMBER = 10,
MRSP_RESOUCE_IN_USE = 12,
MRSP_UNSATISFIED = 13,
MRSP_INVALID_PRIORITY = 19,
MRSP_NOT_OWNER_OF_RESOURCE = 23,
MRSP_NO_MEMORY = 26
} MRSP_Status;
/**
* @brief MrsP rival.
*
* The rivals are used by threads waiting for resource ownership. They are
* registered in the MRSP control block.
*/
typedef struct {
/**
* @brief The node for registration in the MRSP rival chain.
*
* @see MRSP_Control::Rivals.
*/
Chain_Node Node;
/**
* @brief Identification of the rival thread.
*/
Thread_Control *thread;
/**
* @brief The rival state.
*
* Initially no state bits are set (MRSP_RIVAL_STATE_WAITING). The rival
* will busy wait until a state change happens. This can be
* MRSP_RIVAL_STATE_NEW_OWNER or MRSP_RIVAL_STATE_TIMEOUT.
*/
Atomic_Uint state;
} MRSP_Rival;
/**
* @brief MrsP control block.
*/
typedef struct {
/**
* @brief The owner of the MRSP resource.
*
* In case this field is @c NULL, then this MRSP resource has currently no
* owner.
*/
Thread_Control *owner;
/**
* @brief A chain of MrsP rivals waiting for resource ownership.
*
* @see MRSP_Rival::Node.
*/
Chain_Control Rivals;
/**
* @brief One ceiling priority per scheduler instance.
*/
Priority_Control *ceiling_priorities;
} MRSP_Control;
/** @} */
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* RTEMS_SMP */
#endif /* _RTEMS_SCORE_MRSP_H */
cpukit/score/include/rtems/score/mrspimpl.h
+283
View File
@@ -0,0 +1,283 @@
/*
* Copyright (c) 2014 embedded brains GmbH. All rights reserved.
*
* embedded brains GmbH
* Dornierstr. 4
* 82178 Puchheim
* Germany
* <rtems@embedded-brains.de>
*
* 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.
*/
#ifndef _RTEMS_SCORE_MRSPIMPL_H
#define _RTEMS_SCORE_MRSPIMPL_H
#include <rtems/score/mrsp.h>
#if defined(RTEMS_SMP)
#include <rtems/score/assert.h>
#include <rtems/score/chainimpl.h>
#include <rtems/score/schedulerimpl.h>
#include <rtems/score/watchdogimpl.h>
#include <rtems/score/wkspace.h>
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/**
* @addtogroup ScoreMRSP
*
* @{
*/
#define MRSP_RIVAL_STATE_WAITING 0x0U
#define MRSP_RIVAL_STATE_NEW_OWNER 0x1U
#define MRSP_RIVAL_STATE_TIMEOUT 0x2U
RTEMS_INLINE_ROUTINE void _MRSP_Claim_ownership(
MRSP_Control *mrsp,
Thread_Control *new_owner,
Priority_Control ceiling_priority
)
{
++new_owner->resource_count;
mrsp->owner = new_owner;
_Thread_Change_priority( new_owner, ceiling_priority, false );
}
RTEMS_INLINE_ROUTINE MRSP_Status _MRSP_Initialize(
MRSP_Control *mrsp,
Priority_Control ceiling_priority,
Thread_Control *executing,
bool initially_locked
)
{
uint32_t scheduler_count = _Scheduler_Count;
uint32_t i;
if ( initially_locked ) {
return MRSP_INVALID_NUMBER;
}
mrsp->ceiling_priorities = _Workspace_Allocate(
sizeof( *mrsp->ceiling_priorities ) * scheduler_count
);
if ( mrsp->ceiling_priorities == NULL ) {
return MRSP_NO_MEMORY;
}
for ( i = 0 ; i < scheduler_count ; ++i ) {
mrsp->ceiling_priorities[ i ] = ceiling_priority;
}
mrsp->owner = NULL;
_Chain_Initialize_empty( &mrsp->Rivals );
return MRSP_SUCCESSFUL;
}
RTEMS_INLINE_ROUTINE Priority_Control _MRSP_Get_ceiling_priority(
MRSP_Control *mrsp,
uint32_t scheduler_index
)
{
return mrsp->ceiling_priorities[ scheduler_index ];
}
RTEMS_INLINE_ROUTINE void _MRSP_Set_ceiling_priority(
MRSP_Control *mrsp,
uint32_t scheduler_index,
Priority_Control ceiling_priority
)
{
mrsp->ceiling_priorities[ scheduler_index ] = ceiling_priority;
}
RTEMS_INLINE_ROUTINE void _MRSP_Restore_priority( Thread_Control *thread )
{
_Thread_Change_priority( thread, thread->real_priority, true );
}
RTEMS_INLINE_ROUTINE void _MRSP_Add_state(
MRSP_Rival *rival,
unsigned int state
)
{
_Atomic_Fetch_or_uint( &rival->state, state, ATOMIC_ORDER_RELEASE );
}
RTEMS_INLINE_ROUTINE void _MRSP_Timeout(
Objects_Id id,
void *arg
)
{
MRSP_Rival *rival = arg;
(void) id;
_MRSP_Add_state( rival, MRSP_RIVAL_STATE_TIMEOUT );
}
RTEMS_INLINE_ROUTINE MRSP_Status _MRSP_Wait_for_ownership(
MRSP_Control *mrsp,
Thread_Control *executing,
Priority_Control ceiling_priority,
Watchdog_Interval timeout
)
{
MRSP_Status status;
MRSP_Rival rival;
bool previous_life_protection;
unsigned int state;
_Thread_Change_priority( executing, ceiling_priority, false );
rival.thread = executing;
_Atomic_Init_uint( &rival.state, MRSP_RIVAL_STATE_WAITING );
_Chain_Append_unprotected( &mrsp->Rivals, &rival.Node );
if ( timeout > 0 ) {
_Watchdog_Initialize(
&executing->Timer,
_MRSP_Timeout,
0,
&rival
);
_Watchdog_Insert_ticks( &executing->Timer, timeout );
}
previous_life_protection = _Thread_Set_life_protection( true );
_Thread_Enable_dispatch();
_Assert( _Debug_Is_thread_dispatching_allowed() );
while (
_Atomic_Load_uint( &rival.state, ATOMIC_ORDER_ACQUIRE )
== MRSP_RIVAL_STATE_WAITING
) {
/* Wait for state change */
}
_Thread_Disable_dispatch();
_Thread_Set_life_protection( previous_life_protection );
if ( timeout > 0 ) {
_Watchdog_Remove( &executing->Timer );
}
_Chain_Extract_unprotected( &rival.Node );
state = _Atomic_Load_uint( &rival.state, ATOMIC_ORDER_RELAXED );
if ( ( state & MRSP_RIVAL_STATE_NEW_OWNER ) != 0 ) {
++executing->resource_count;
status = MRSP_SUCCESSFUL;
} else {
if ( executing->resource_count == 0 ) {
_MRSP_Restore_priority( executing );
}
status = MRSP_TIMEOUT;
}
return status;
}
RTEMS_INLINE_ROUTINE MRSP_Status _MRSP_Obtain(
MRSP_Control *mrsp,
Thread_Control *executing,
bool wait,
Watchdog_Interval timeout
)
{
MRSP_Status status;
const Scheduler_Control *scheduler = _Scheduler_Get( executing );
uint32_t scheduler_index = _Scheduler_Get_index( scheduler );
Priority_Control ceiling_priority =
_MRSP_Get_ceiling_priority( mrsp, scheduler_index );
bool priority_ok = !_Scheduler_Is_priority_higher_than(
scheduler,
executing->current_priority,
ceiling_priority
);
if ( !priority_ok) {
return MRSP_INVALID_PRIORITY;
}
if ( mrsp->owner == NULL ) {
_MRSP_Claim_ownership( mrsp, executing, ceiling_priority );
status = MRSP_SUCCESSFUL;
} else if ( mrsp->owner == executing ) {
status = MRSP_UNSATISFIED;
} else if ( wait ) {
status = _MRSP_Wait_for_ownership(
mrsp,
executing,
ceiling_priority,
timeout
);
} else {
status = MRSP_UNSATISFIED;
}
return status;
}
RTEMS_INLINE_ROUTINE MRSP_Status _MRSP_Release(
MRSP_Control *mrsp,
Thread_Control *executing
)
{
uint32_t resource_count = executing->resource_count;
if ( mrsp->owner != executing ) {
return MRSP_NOT_OWNER_OF_RESOURCE;
}
if ( resource_count == 1 ) {
executing->resource_count = 0;
_MRSP_Restore_priority( executing );
} else {
executing->resource_count = resource_count - 1;
}
if ( _Chain_Is_empty( &mrsp->Rivals ) ) {
mrsp->owner = NULL;
} else {
MRSP_Rival *rival = (MRSP_Rival *) _Chain_First( &mrsp->Rivals );
mrsp->owner = rival->thread;
_MRSP_Add_state( rival, MRSP_RIVAL_STATE_NEW_OWNER );
}
return MRSP_SUCCESSFUL;
}
RTEMS_INLINE_ROUTINE MRSP_Status _MRSP_Destroy( MRSP_Control *mrsp )
{
if ( mrsp->owner != NULL ) {
return MRSP_RESOUCE_IN_USE;
}
_Workspace_Free( mrsp->ceiling_priorities );
return MRSP_SUCCESSFUL;
}
/** @} */
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* RTEMS_SMP */
#endif /* _RTEMS_SCORE_MRSPIMPL_H */
cpukit/score/include/rtems/score/schedulerimpl.h
+10
View File
@@ -617,6 +617,16 @@ RTEMS_INLINE_ROUTINE bool _Scheduler_Get_by_id(
&& _Scheduler_Get_processor_count( scheduler ) > 0;
}
RTEMS_INLINE_ROUTINE bool _Scheduler_Is_id_valid( Objects_Id id )
{
const Scheduler_Control *scheduler;
bool ok = _Scheduler_Get_by_id( id, &scheduler );
(void) scheduler;
return ok;
}
RTEMS_INLINE_ROUTINE uint32_t _Scheduler_Get_index(
const Scheduler_Control *scheduler
)
cpukit/score/preinstall.am
+8
View File
@@ -139,6 +139,14 @@ $(PROJECT_INCLUDE)/rtems/score/freechain.h: include/rtems/score/freechain.h $(PR
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/freechain.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/freechain.h
$(PROJECT_INCLUDE)/rtems/score/mrsp.h: include/rtems/score/mrsp.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/mrsp.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/mrsp.h
$(PROJECT_INCLUDE)/rtems/score/mrspimpl.h: include/rtems/score/mrspimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/mrspimpl.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/mrspimpl.h
$(PROJECT_INCLUDE)/rtems/score/object.h: include/rtems/score/object.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/object.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/object.h
doc/user/Makefile.am
+1 -1
View File
@@ -96,7 +96,7 @@ sem.texi: sem.t
-n "Barrier Manager" < $< > $@
barrier.texi: barrier.t
$(BMENU2) -p "Semaphore Manager SEMAPHORE_FLUSH - Unblock all tasks waiting on a semaphore" \
$(BMENU2) -p "Semaphore Manager SEMAPHORE_SET_PRIORITY - Set priority by scheduler for a semaphore" \
-u "Top" \
-n "Message Manager" < $< > $@
doc/user/conf.t
+32
View File
@@ -685,6 +685,38 @@ API Semaphores that can be concurrently active.
@subheading NOTES:
This object class can be configured in unlimited allocation mode.
@c
@c === CONFIGURE_MAXIMUM_MRSP_SEMAPHORES ===
@c
@subsection Specify Maximum Classic API Semaphores usable with MrsP
@findex CONFIGURE_MAXIMUM_MRSP_SEMAPHORES
@table @b
@item CONSTANT:
@code{CONFIGURE_MAXIMUM_MRSP_SEMAPHORES}
@item DATA TYPE:
Unsigned integer (@code{uint32_t}).
@item RANGE:
Zero or positive.
@item DEFAULT VALUE:
The default value is 0.
@end table
@subheading DESCRIPTION:
@code{CONFIGURE_MAXIMUM_MRSP_SEMAPHORES} is the
maximum number of Classic API Semaphores using the Multiprocessor Resource
Sharing Protocol (MrsP) that can be concurrently active.
@subheading NOTES:
This configuration option is only used on SMP configurations. On uni-processor
configurations the Priority Ceiling Protocol is used for MrsP semaphores and
thus no extra memory is necessary.
@c
@c === CONFIGURE_MAXIMUM_MESSAGE_QUEUES ===
@c
doc/user/sem.t
+209 -4
View File
@@ -24,6 +24,8 @@ semaphore manager are:
@item @code{@value{DIRPREFIX}semaphore_obtain} - Acquire a semaphore
@item @code{@value{DIRPREFIX}semaphore_release} - Release a semaphore
@item @code{@value{DIRPREFIX}semaphore_flush} - Unblock all tasks waiting on a semaphore
@item @code{@value{DIRPREFIX}semaphore_set_priority} - Set priority by
scheduler for a semaphore
@end itemize
@section Background
@@ -173,6 +175,22 @@ any of the semaphores the task holds. Only when the task
releases ALL of the binary semaphores it holds will its priority
be restored to the normal value.
@subsection Multiprocessor Resource Sharing Protocol
The Multiprocessor Resource Sharing Protocol (MrsP) is defined in @cite{A.
Burns and A.J. Wellings, A Schedulability Compatible Multiprocessor Resource
Sharing Protocol - MrsP, Proceedings of the 25th Euromicro Conference on
Real-Time Systems (ECRTS 2013), July 2013}. It is a generalization of the
Priority Ceiling Protocol to SMP systems. Each MrsP semaphore uses a ceiling
priority per scheduler instance. These ceiling priorities can be specified
with @code{rtems_semaphore_set_priority()}. A task obtaining or owning a MrsP
semaphore will execute with the ceiling priority for its scheduler instance as
specified by the MrsP semaphore object. Tasks waiting to get ownership of a
MrsP semaphore will not relinquish the processor voluntarily. In case the
owner of a MrsP semaphore gets preempted it can ask all tasks waiting for this
semaphore to help out and temporarily borrow the right to execute on one of
their assigned processors.
@subsection Building a Semaphore Attribute Set
In general, an attribute set is built by a bitwise OR
@@ -198,11 +216,17 @@ inheritance (default)
@item @code{@value{RPREFIX}INHERIT_PRIORITY} - use priority inheritance
@item @code{@value{RPREFIX}PRIORITY_CEILING} - use priority ceiling
@item @code{@value{RPREFIX}NO_PRIORITY_CEILING} - do not use priority
ceiling (default)
@item @code{@value{RPREFIX}PRIORITY_CEILING} - use priority ceiling
@item @code{@value{RPREFIX}NO_MULTIPROCESSOR_RESOURCE_SHARING} - do not use
Multiprocessor Resource Sharing Protocol (default)
@item @code{@value{RPREFIX}MULTIPROCESSOR_RESOURCE_SHARING} - use
Multiprocessor Resource Sharing Protocol
@item @code{@value{RPREFIX}LOCAL} - local semaphore (default)
@item @code{@value{RPREFIX}GLOBAL} - global semaphore
@@ -489,11 +513,17 @@ inheritance (default)
@item @code{@value{RPREFIX}INHERIT_PRIORITY} - use priority inheritance
@item @code{@value{RPREFIX}PRIORITY_CEILING} - use priority ceiling
@item @code{@value{RPREFIX}NO_PRIORITY_CEILING} - do not use priority
ceiling (default)
@item @code{@value{RPREFIX}PRIORITY_CEILING} - use priority ceiling
@item @code{@value{RPREFIX}NO_MULTIPROCESSOR_RESOURCE_SHARING} - do not use
Multiprocessor Resource Sharing Protocol (default)
@item @code{@value{RPREFIX}MULTIPROCESSOR_RESOURCE_SHARING} - use
Multiprocessor Resource Sharing Protocol
@item @code{@value{RPREFIX}LOCAL} - local semaphore (default)
@item @code{@value{RPREFIX}GLOBAL} - global semaphore
@@ -512,6 +542,11 @@ earlier discussion on this.
The total number of global objects, including semaphores, is limited by
the maximum_global_objects field in the Configuration Table.
It is not allowed to create an initially locked MrsP semaphore and the
@code{@value{RPREFIX}INVALID_NUMBER} status code will be returned on SMP
configurations in this case. This prevents lock order reversal problems with
the allocator mutex.
@c
@c
@c
@@ -735,6 +770,10 @@ until the semaphore is released.
A clock tick is required to support the timeout functionality of
this directive.
It is not allowed to obtain a MrsP semaphore more than once by one task at a
time (nested access) and the @code{@value{RPREFIX}UNSATISFIED} status code will
be returned on SMP configurations in this case.
@c
@c
@c
@@ -831,6 +870,8 @@ procedure Semaphore_Flush (
@subheading DIRECTIVE STATUS CODES:
@code{@value{RPREFIX}SUCCESSFUL} - semaphore released successfully@*
@code{@value{RPREFIX}INVALID_ID} - invalid semaphore id@*
@code{@value{RPREFIX}NOT_DEFINED} - operation not defined for the protocol of
the semaphore@*
@code{@value{RPREFIX}ILLEGAL_ON_REMOTE_OBJECT} - not supported for remote semaphores
@subheading DESCRIPTION:
@@ -858,4 +899,168 @@ If the task to be unblocked resides on a different
node from the semaphore, then the waiting task is
unblocked, and the proxy used to represent the task is reclaimed.
It is not allowed to flush a MrsP semaphore and the
@code{@value{RPREFIX}NOT_DEFINED} status code will be returned on SMP
configurations in this case.
@c
@c
@c
@page
@subsection SEMAPHORE_SET_PRIORITY - Set priority by scheduler for a semaphore
@cindex set priority by scheduler for a semaphore
@subheading CALLING SEQUENCE:
@ifset is-C
@findex rtems_semaphore_set_priority
@example
rtems_status_code rtems_semaphore_set_priority(
rtems_id semaphore_id,
rtems_id scheduler_id,
rtems_task_priority new_priority,
rtems_task_priority *old_priority
);
@end example
@end ifset
@subheading DIRECTIVE STATUS CODES:
@code{@value{RPREFIX}SUCCESSFUL} - successful operation@*
@code{@value{RPREFIX}INVALID_ID} - invalid semaphore or scheduler id@*
@code{@value{RPREFIX}INVALID_ADDRESS} - @code{old_priority} is NULL@*
@code{@value{RPREFIX}INVALID_PRIORITY} - invalid new priority value@*
@code{@value{RPREFIX}NOT_DEFINED} - operation not defined for the protocol of
the semaphore@*
@code{@value{RPREFIX}ILLEGAL_ON_REMOTE_OBJECT} - not supported for remote semaphores
@subheading DESCRIPTION:
This directive sets the priority value with respect to the specified scheduler
of a semaphore.
The special priority value @code{RTEMS_CURRENT_PRIORITY} can be used to get the
current priority value without changing it.
The interpretation of the priority value depends on the protocol of the
semaphore object.
@itemize @bullet
@item The Multiprocessor Resource Sharing Protocol needs a ceiling priority per
scheduler instance. This operation can be used to specify these priority
values.
@item For the Priority Ceiling Protocol the ceiling priority is used with this
operation.
@item For other protocols this operation is not defined.
@end itemize
@subheading EXAMPLE:
@example
@group
#include <assert.h>
#include <stdlib.h>
#include <rtems.h>
#define SCHED_A rtems_build_name(' ', ' ', ' ', 'A')
#define SCHED_B rtems_build_name(' ', ' ', ' ', 'B')
static void Init(rtems_task_argument arg)
@{
rtems_status_code sc;
rtems_id semaphore_id;
rtems_id scheduler_a_id;
rtems_id scheduler_b_id;
rtems_task_priority prio;
/* Get the scheduler identifiers */
sc = rtems_scheduler_ident(SCHED_A, &scheduler_a_id);
assert(sc == RTEMS_SUCCESSFUL);
sc = rtems_scheduler_ident(SCHED_B, &scheduler_b_id);
assert(sc == RTEMS_SUCCESSFUL);
/* Create a MrsP semaphore object */
sc = rtems_semaphore_create(
rtems_build_name('M', 'R', 'S', 'P'),
1,
RTEMS_MULTIPROCESSOR_RESOURCE_SHARING
| RTEMS_BINARY_SEMAPHORE,
1,
&semaphore_id
);
assert(sc == RTEMS_SUCCESSFUL);
/*
* The ceiling priority values per scheduler are equal to the value specified
* for object creation.
*/
prio = RTEMS_CURRENT_PRIORITY;
sc = rtems_semaphore_set_priority(semaphore_id, scheduler_a_id, prio, &prio);
assert(sc == RTEMS_SUCCESSFUL);
assert(prio == 1);
/* Check the old value and set a new ceiling priority for scheduler B */
prio = 2;
sc = rtems_semaphore_set_priority(semaphore_id, scheduler_b_id, prio, &prio);
assert(sc == RTEMS_SUCCESSFUL);
assert(prio == 1);
/* Check the ceiling priority values */
prio = RTEMS_CURRENT_PRIORITY;
sc = rtems_semaphore_set_priority(semaphore_id, scheduler_a_id, prio, &prio);
assert(sc == RTEMS_SUCCESSFUL);
assert(prio == 1);
prio = RTEMS_CURRENT_PRIORITY;
sc = rtems_semaphore_set_priority(semaphore_id, scheduler_b_id, prio, &prio);
assert(sc == RTEMS_SUCCESSFUL);
assert(prio == 2);
sc = rtems_semaphore_delete(semaphore_id);
assert(sc == RTEMS_SUCCESSFUL);
exit(0);
@}
#define CONFIGURE_SMP_APPLICATION
#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_MAXIMUM_TASKS 1
#define CONFIGURE_MAXIMUM_SEMAPHORES 1
#define CONFIGURE_MAXIMUM_MRSP_SEMAPHORES 1
#define CONFIGURE_SMP_MAXIMUM_PROCESSORS 2
#define CONFIGURE_SCHEDULER_SIMPLE_SMP
#include <rtems/scheduler.h>
RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(a);
RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(b);
#define CONFIGURE_SCHEDULER_CONTROLS \
RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(a, SCHED_A), \
RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(b, SCHED_B)
#define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \
RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY), \
RTEMS_SCHEDULER_ASSIGN(1, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY)
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
#define CONFIGURE_INIT
#include <rtems/confdefs.h>
@end group
@end example
testsuites/smptests/Makefile.am
+1
View File
@@ -22,6 +22,7 @@ SUBDIRS += smpload01
SUBDIRS += smplock01
SUBDIRS += smpmigration01
SUBDIRS += smpmigration02
SUBDIRS += smpmrsp01
SUBDIRS += smpscheduler01
SUBDIRS += smpscheduler02
SUBDIRS += smpscheduler03
testsuites/smptests/configure.ac
+1
View File
@@ -77,6 +77,7 @@ smpload01/Makefile
smplock01/Makefile
smpmigration01/Makefile
smpmigration02/Makefile
smpmrsp01/Makefile
smppsxaffinity01/Makefile
smppsxaffinity02/Makefile
smppsxsignal01/Makefile
testsuites/smptests/smpmrsp01/Makefile.am
+19
View File
@@ -0,0 +1,19 @@
rtems_tests_PROGRAMS = smpmrsp01
smpmrsp01_SOURCES = init.c
dist_rtems_tests_DATA = smpmrsp01.scn smpmrsp01.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
LINK_OBJS = $(smpmrsp01_OBJECTS)
LINK_LIBS = $(smpmrsp01_LDLIBS)
smpmrsp01$(EXEEXT): $(smpmrsp01_OBJECTS) $(smpmrsp01_DEPENDENCIES)
@rm -f smpmrsp01$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
testsuites/smptests/smpmrsp01/init.c
+698
View File
File diff suppressed because it is too large Load Diff
testsuites/smptests/smpmrsp01/smpmrsp01.doc
+15
View File
@@ -0,0 +1,15 @@
This file describes the directives and concepts tested by this test set.
test set name: smpmrsp01
directives:
- _MRSP_Initialize()
- _MRSP_Obtain()
- _MRSP_Release()
- _MRSP_Get_ceiling_priority()
- _MRSP_Set_ceiling_priority()
concepts:
- Ensure that MrsP semaphores work.
testsuites/smptests/smpmrsp01/smpmrsp01.scn
+147
View File
@@ -0,0 +1,147 @@
*** BEGIN OF TEST SMPMRSP 1 ***
test MrsP flush error
test MrsP initially locked error
test MrsP nested obtain error
test MrsP obtain and release
test MrsP load
worker[0][0]
sleep = 890
timeout = 1455
obtain[0] = 141069
obtain[1] = 111062
obtain[2] = 255631
obtain[3] = 186559
obtain[4] = 310707
obtain[5] = 246838
obtain[6] = 331853
obtain[7] = 298938
obtain[8] = 331989
obtain[9] = 343041
obtain[10] = 310191
obtain[11] = 381001
obtain[12] = 269001
obtain[13] = 412849
obtain[14] = 217768
obtain[15] = 444036
obtain[16] = 160721
obtain[17] = 476211
obtain[18] = 151929
obtain[19] = 438664
obtain[20] = 132708
obtain[21] = 388090
obtain[22] = 118166
obtain[23] = 337468
obtain[24] = 96676
obtain[25] = 271392
obtain[26] = 75445
obtain[27] = 203259
obtain[28] = 52933
obtain[29] = 132769
obtain[30] = 27856
obtain[31] = 57014
worker[0][1]
sleep = 15
timeout = 33
obtain[0] = 2241
obtain[1] = 1890
obtain[2] = 4128
obtain[3] = 3128
obtain[4] = 5110
obtain[5] = 3981
obtain[6] = 5348
obtain[7] = 4825
obtain[8] = 5184
obtain[9] = 5720
obtain[10] = 4488
obtain[11] = 6038
obtain[12] = 4095
obtain[13] = 6658
obtain[14] = 3754
obtain[15] = 6768
obtain[16] = 2654
obtain[17] = 7051
obtain[18] = 2679
obtain[19] = 6956
obtain[20] = 2498
obtain[21] = 6173
obtain[22] = 2024
obtain[23] = 5514
obtain[24] = 1650
obtain[25] = 4141
obtain[26] = 1568
obtain[27] = 3285
obtain[28] = 812
obtain[29] = 2317
obtain[30] = 527
obtain[31] = 996
worker[1][0]
sleep = 890
timeout = 1581
obtain[0] = 140732
obtain[1] = 111655
obtain[2] = 256936
obtain[3] = 186534
obtain[4] = 311714
obtain[5] = 248065
obtain[6] = 333155
obtain[7] = 300734
obtain[8] = 329675
obtain[9] = 343832
obtain[10] = 309112
obtain[11] = 380452
obtain[12] = 270156
obtain[13] = 416600
obtain[14] = 223484
obtain[15] = 444991
obtain[16] = 163750
obtain[17] = 476096
obtain[18] = 150317
obtain[19] = 432827
obtain[20] = 133946
obtain[21] = 388441
obtain[22] = 119760
obtain[23] = 337033
obtain[24] = 99153
obtain[25] = 271558
obtain[26] = 77535
obtain[27] = 202607
obtain[28] = 53225
obtain[29] = 130801
obtain[30] = 27321
obtain[31] = 56239
worker[1][1]
sleep = 25
timeout = 48
obtain[0] = 2164
obtain[1] = 1722
obtain[2] = 4095
obtain[3] = 3002
obtain[4] = 4950
obtain[5] = 4020
obtain[6] = 5235
obtain[7] = 4716
obtain[8] = 5407
obtain[9] = 5070
obtain[10] = 5082
obtain[11] = 6130
obtain[12] = 4368
obtain[13] = 6108
obtain[14] = 3270
obtain[15] = 6800
obtain[16] = 2652
obtain[17] = 7633
obtain[18] = 2451
obtain[19] = 7480
obtain[20] = 2079
obtain[21] = 6232
obtain[22] = 1590
obtain[23] = 5739
obtain[24] = 1627
obtain[25] = 4030
obtain[26] = 1296
obtain[27] = 2803
obtain[28] = 969
obtain[29] = 2253
obtain[30] = 217
obtain[31] = 930
*** END OF TEST SMPMRSP 1 ***
testsuites/sptests/Makefile.am
+1
View File
@@ -37,6 +37,7 @@ if HAS_SMP
else
_SUBDIRS += sp29
endif
_SUBDIRS += spmrsp01
_SUBDIRS += spscheduler01
_SUBDIRS += spprofiling01
_SUBDIRS += spfatal28
testsuites/sptests/configure.ac
+1
View File
@@ -40,6 +40,7 @@ AM_CONDITIONAL(HAS_SMP,test "$rtems_cv_RTEMS_SMP" = "yes")
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
spmrsp01/Makefile
spscheduler01/Makefile
spfatal28/Makefile
spthreadlife01/Makefile
testsuites/sptests/spmrsp01/Makefile.am
+19
View File
@@ -0,0 +1,19 @@
rtems_tests_PROGRAMS = spmrsp01
spmrsp01_SOURCES = init.c
dist_rtems_tests_DATA = spmrsp01.scn spmrsp01.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
LINK_OBJS = $(spmrsp01_OBJECTS)
LINK_LIBS = $(spmrsp01_LDLIBS)
spmrsp01$(EXEEXT): $(spmrsp01_OBJECTS) $(spmrsp01_DEPENDENCIES)
@rm -f spmrsp01$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
testsuites/sptests/spmrsp01/init.c
+329
View File
@@ -0,0 +1,329 @@
/*
* Copyright (c) 2014 embedded brains GmbH. All rights reserved.
*
* embedded brains GmbH
* Dornierstr. 4
* 82178 Puchheim
* Germany
* <rtems@embedded-brains.de>
*
* 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.h>
#include <rtems/libcsupport.h>
#include "tmacros.h"
const char rtems_test_name[] = "SPMRSP 1";
typedef struct {
rtems_id semaphore_id;
rtems_id task_id;
} test_mrsp_context;
static void create_not_defined(rtems_attribute attr)
{
rtems_status_code sc;
rtems_id id;
sc = rtems_semaphore_create(
rtems_build_name('M', 'R', 'S', 'P'),
1,
attr,
0,
&id
);
rtems_test_assert(sc == RTEMS_NOT_DEFINED);
}
static void test_mrsp_create_errors(void)
{
puts("test MrsP create errors");
create_not_defined(
RTEMS_MULTIPROCESSOR_RESOURCE_SHARING
| RTEMS_COUNTING_SEMAPHORE
);
create_not_defined(
RTEMS_MULTIPROCESSOR_RESOURCE_SHARING
| RTEMS_SIMPLE_BINARY_SEMAPHORE
);
create_not_defined(
RTEMS_MULTIPROCESSOR_RESOURCE_SHARING
| RTEMS_BINARY_SEMAPHORE
| RTEMS_PRIORITY
);
create_not_defined(
RTEMS_MULTIPROCESSOR_RESOURCE_SHARING
| RTEMS_INHERIT_PRIORITY
| RTEMS_BINARY_SEMAPHORE
);
create_not_defined(
RTEMS_MULTIPROCESSOR_RESOURCE_SHARING
| RTEMS_PRIORITY_CEILING
| RTEMS_BINARY_SEMAPHORE
);
create_not_defined(
RTEMS_MULTIPROCESSOR_RESOURCE_SHARING
| RTEMS_INHERIT_PRIORITY
| RTEMS_PRIORITY_CEILING
| RTEMS_BINARY_SEMAPHORE
);
}
static void assert_prio(rtems_task_priority expected_prio)
{
rtems_status_code sc;
rtems_task_priority prio;
sc = rtems_task_set_priority(RTEMS_SELF, RTEMS_CURRENT_PRIORITY, &prio);
rtems_test_assert(sc == RTEMS_SUCCESSFUL);
rtems_test_assert(prio == expected_prio);
}
static void test_mrsp_obtain_release(void)
{
rtems_status_code sc;
rtems_id id;
puts("test MrsP obtain and release");
sc = rtems_semaphore_create(
rtems_build_name('M', 'R', 'S', 'P'),
1,
RTEMS_MULTIPROCESSOR_RESOURCE_SHARING
| RTEMS_BINARY_SEMAPHORE,
1,
&id
);
rtems_test_assert(sc == RTEMS_SUCCESSFUL);
assert_prio(2);
sc = rtems_semaphore_obtain(id, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
rtems_test_assert(sc == RTEMS_SUCCESSFUL);
assert_prio(1);
sc = rtems_semaphore_delete(id);
rtems_test_assert(sc == RTEMS_RESOURCE_IN_USE);
sc = rtems_semaphore_release(id);
rtems_test_assert(sc == RTEMS_SUCCESSFUL);
assert_prio(2);
sc = rtems_semaphore_delete(id);
rtems_test_assert(sc == RTEMS_SUCCESSFUL);
}
static void test_mrsp_set_priority_errors(void)
{
rtems_status_code sc;
rtems_id id;
rtems_id scheduler_id;
rtems_task_priority prio;
puts("test MrsP set priority errors");
sc = rtems_task_get_scheduler(RTEMS_SELF, &scheduler_id);
rtems_test_assert(sc == RTEMS_SUCCESSFUL);
sc = rtems_semaphore_create(
rtems_build_name('C', 'O', 'N', 'T'),
0,
RTEMS_COUNTING_SEMAPHORE,
0,
&id
);
rtems_test_assert(sc == RTEMS_SUCCESSFUL);
prio = 1;
sc = rtems_semaphore_set_priority(RTEMS_ID_NONE, scheduler_id, prio, &prio);
rtems_test_assert(sc == RTEMS_INVALID_ID);
prio = 1;
sc = rtems_semaphore_set_priority(id, RTEMS_ID_NONE, prio, &prio);
rtems_test_assert(sc == RTEMS_INVALID_ID);
prio = 0xffffffff;
sc = rtems_semaphore_set_priority(id, scheduler_id, prio, &prio);
rtems_test_assert(sc == RTEMS_INVALID_PRIORITY);
prio = 1;
sc = rtems_semaphore_set_priority(id, scheduler_id, prio, NULL);
rtems_test_assert(sc == RTEMS_INVALID_ADDRESS);
prio = 1;
sc = rtems_semaphore_set_priority(id, scheduler_id, prio, &prio);
rtems_test_assert(sc == RTEMS_NOT_DEFINED);
sc = rtems_semaphore_delete(id);
rtems_test_assert(sc == RTEMS_SUCCESSFUL);
}
static void test_mrsp_set_priority(void)
{
rtems_status_code sc;
rtems_id id;
rtems_id scheduler_id;
rtems_task_priority prio;
puts("test MrsP set priority");
sc = rtems_task_get_scheduler(RTEMS_SELF, &scheduler_id);
rtems_test_assert(sc == RTEMS_SUCCESSFUL);
sc = rtems_semaphore_create(
rtems_build_name('M', 'R', 'S', 'P'),
1,
RTEMS_MULTIPROCESSOR_RESOURCE_SHARING
| RTEMS_BINARY_SEMAPHORE,
1,
&id
);
rtems_test_assert(sc == RTEMS_SUCCESSFUL);
prio = RTEMS_CURRENT_PRIORITY;
sc = rtems_semaphore_set_priority(id, scheduler_id, prio, &prio);
rtems_test_assert(sc == RTEMS_SUCCESSFUL);
rtems_test_assert(prio == 1);
prio = 1;
sc = rtems_semaphore_set_priority(id, scheduler_id, prio, &prio);
rtems_test_assert(sc == RTEMS_SUCCESSFUL);
rtems_test_assert(prio == 1);
prio = 2;
sc = rtems_semaphore_set_priority(id, scheduler_id, prio, &prio);
rtems_test_assert(sc == RTEMS_SUCCESSFUL);
rtems_test_assert(prio == 1);
prio = RTEMS_CURRENT_PRIORITY;
sc = rtems_semaphore_set_priority(id, scheduler_id, prio, &prio);
rtems_test_assert(sc == RTEMS_SUCCESSFUL);
rtems_test_assert(prio == 2);
sc = rtems_semaphore_delete(id);
rtems_test_assert(sc == RTEMS_SUCCESSFUL);
}
static void test_mrsp_task(rtems_task_argument arg)
{
test_mrsp_context *ctx = (test_mrsp_context *) arg;
rtems_status_code sc;
sc = rtems_semaphore_release(ctx->semaphore_id);
rtems_test_assert(sc == RTEMS_NOT_OWNER_OF_RESOURCE);
sc = rtems_semaphore_obtain(ctx->semaphore_id, RTEMS_NO_WAIT, 0);
rtems_test_assert(sc == RTEMS_UNSATISFIED);
sc = rtems_semaphore_obtain(ctx->semaphore_id, RTEMS_WAIT, 1);
rtems_test_assert(sc == RTEMS_TIMEOUT);
sc = rtems_event_transient_send(ctx->task_id);
rtems_test_assert(sc == RTEMS_SUCCESSFUL);
rtems_task_delete(RTEMS_SELF);
rtems_test_assert(0);
}
static void test_mrsp_timeout_and_not_owner_of_resource(void)
{
rtems_status_code sc;
rtems_id id;
rtems_id task_id;
test_mrsp_context ctx;
puts("test MrsP timeout and not owner of resource");
sc = rtems_semaphore_create(
rtems_build_name('M', 'R', 'S', 'P'),
1,
RTEMS_MULTIPROCESSOR_RESOURCE_SHARING
| RTEMS_BINARY_SEMAPHORE,
1,
&id
);
rtems_test_assert(sc == RTEMS_SUCCESSFUL);
sc = rtems_semaphore_obtain(id, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
rtems_test_assert(sc == RTEMS_SUCCESSFUL);
sc = rtems_task_create(
rtems_build_name('M', 'R', 'S', 'P'),
1,
RTEMS_MINIMUM_STACK_SIZE,
RTEMS_DEFAULT_MODES,
RTEMS_DEFAULT_ATTRIBUTES,
&task_id
);
rtems_test_assert(sc == RTEMS_SUCCESSFUL);
ctx.semaphore_id = id;
ctx.task_id = rtems_task_self();
sc = rtems_task_start(task_id, test_mrsp_task, (rtems_task_argument) &ctx);
rtems_test_assert(sc == RTEMS_SUCCESSFUL);
sc = rtems_event_transient_receive(RTEMS_WAIT, RTEMS_NO_TIMEOUT);
rtems_test_assert(sc == RTEMS_SUCCESSFUL);
sc = rtems_semaphore_release(id);
rtems_test_assert(sc == RTEMS_SUCCESSFUL);
sc = rtems_semaphore_delete(id);
rtems_test_assert(sc == RTEMS_SUCCESSFUL);
}
static void Init(rtems_task_argument arg)
{
rtems_resource_snapshot snapshot;
TEST_BEGIN();
rtems_resource_snapshot_take(&snapshot);
test_mrsp_create_errors();
test_mrsp_obtain_release();
test_mrsp_set_priority_errors();
test_mrsp_set_priority();
test_mrsp_timeout_and_not_owner_of_resource();
rtems_test_assert(rtems_resource_snapshot_check(&snapshot));
TEST_END();
rtems_test_exit(0);
}
#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
#define CONFIGURE_MAXIMUM_TASKS 2
#define CONFIGURE_MAXIMUM_SEMAPHORES 1
#define CONFIGURE_MAXIMUM_MRSP_SEMAPHORES 1
#define CONFIGURE_INIT_TASK_PRIORITY 2
#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
#define CONFIGURE_INIT
#include <rtems/confdefs.h>
testsuites/sptests/spmrsp01/spmrsp01.doc
+13
View File
@@ -0,0 +1,13 @@
This file describes the directives and concepts tested by this test set.
test set name: spmrsp01
directives:
- rtems_semaphore_create()
- rtems_semaphore_set_priority()
concepts:
- Ensure that the RTEMS_MULTIPROCESSOR_RESOURCE_SHARING attribute and
semaphores work on uni-processor configurations.
testsuites/sptests/spmrsp01/spmrsp01.scn
+7
View File
@@ -0,0 +1,7 @@
*** BEGIN OF TEST SPMRSP 1 ***
test MRSP create errors
test MRSP obtain and release
test MRSP set priority errors
test MRSP set priority
test MRSP timeout and not owner of resource
*** END OF TEST SPMRSP 1 ***