RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

score: Add parameter to Giant acquire/release

Browse Source 
Update #2273.
This commit is contained in:
Sebastian Huber
2015-02-26 10:29:02 +01:00
parent c5436ff482
commit 2b7fe35688
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cpukit/score/include/rtems/score/threaddispatch.h
View File

@@ -97,17 +97,25 @@ RTEMS_INLINE_ROUTINE void _Thread_Dispatch_initialization( void )
* This lock is implicitly acquired in
* _Thread_Dispatch_increment_disable_level().
*
* Thread dispatching must be disabled before this lock can be acquired.
* Thread dispatching must be disabled before the Giant lock can be acquired
* and must no be enabled while owning the Giant lock. The thread dispatch
* disable level is not altered by this function.
*
* @param[in] cpu_self The current processor.
*/
void _Giant_Acquire( void );
void _Giant_Acquire( Per_CPU_Control *cpu_self );
/**
* @brief Releases the giant lock.
*
* This lock is implicitly released in
* _Thread_Dispatch_decrement_disable_level().
*
* The thread dispatch disable level is not altered by this function.
*
* @param[in] cpu_self The current processor.
*/
void _Giant_Release( void );
void _Giant_Release( Per_CPU_Control *cpu_self );
/**
* @brief Releases the giant lock completely if held by the executing processor.
@@ -116,9 +124,9 @@ RTEMS_INLINE_ROUTINE void _Thread_Dispatch_initialization( void )
*
* The only use case for this operation is in _SMP_Request_shutdown().
*
* @param[in] self_cpu The current processor.
* @param[in] cpu_self The current processor.
*/
void _Giant_Drop( Per_CPU_Control *self_cpu );
void _Giant_Drop( Per_CPU_Control *cpu_self );
/**
* @brief Increments the thread dispatch level.

2
cpukit/score/include/rtems/score/threadimpl.h
View File

@@ -558,7 +558,7 @@ RTEMS_INLINE_ROUTINE void _Thread_Restart_self( Thread_Control *executing )
#if defined(RTEMS_SMP)
ISR_Level level;
_Giant_Release();
_Giant_Release( _Per_CPU_Get() );
_ISR_Disable_without_giant( level );
( void ) level;

8
cpukit/score/src/threaddispatchdisablelevel.c
View File

@@ -119,23 +119,23 @@ uint32_t _Thread_Dispatch_decrement_disable_level( void )
return disable_level;
}
void _Giant_Acquire( void )
void _Giant_Acquire( Per_CPU_Control *cpu_self )
{
ISR_Level isr_level;
_ISR_Disable_without_giant( isr_level );
_Assert( _Thread_Dispatch_disable_level != 0 );
_Giant_Do_acquire( _Per_CPU_Get() );
_Giant_Do_acquire( cpu_self );
_ISR_Enable_without_giant( isr_level );
}
void _Giant_Release( void )
void _Giant_Release( Per_CPU_Control *cpu_self )
{
ISR_Level isr_level;
_ISR_Disable_without_giant( isr_level );
_Assert( _Thread_Dispatch_disable_level != 0 );
_Giant_Do_release( _Per_CPU_Get() );
_Giant_Do_release( cpu_self );
_ISR_Enable_without_giant( isr_level );
}