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

score: Delete _Assert_Thread_dispatching_repressed

Browse Source 
Add _Debug_Is_thread_dispatching_allowed().  This makes it possible to
assert the opposite.

Use _ISR_Disable_without_giant()/_ISR_Enable_without_giant() to avoid
misleading secondary assertion failures.
This commit is contained in:
Sebastian Huber
2014-03-18 11:49:38 +01:00
parent 51f823c932
commit ff25926701
4 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cpukit/score/Makefile.am
View File

@@ -331,7 +331,7 @@ libscore_a_SOURCES += src/apiext.c src/chain.c src/chainappend.c \
src/chainextract.c src/chainget.c src/chaininsert.c \
src/chainappendempty.c src/chainprependempty.c src/chaingetempty.c \
src/chainnodecount.c \
src/assertthreaddispatchingrepressed.c \
src/debugisthreaddispatchingallowed.c \
src/interr.c src/isr.c src/wkspace.c src/wkstringduplicate.c
libscore_a_SOURCES += src/profilingisrentryexit.c

8
cpukit/score/include/rtems/score/assert.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013 embedded brains GmbH. All rights reserved.
* Copyright (c) 2013-2014 embedded brains GmbH. All rights reserved.
*
* embedded brains GmbH
* Dornierstr. 4
@@ -39,15 +39,13 @@ extern "C" {
#endif
/**
* @brief Asserts that thread dispatching is repressed.
* @brief Returns true if thread dispatching is allowed.
*
* Thread dispatching can be repressed via _Thread_Disable_dispatch() or
* _ISR_Disable().
*/
#if defined( RTEMS_DEBUG )
void _Assert_Thread_dispatching_repressed( void );
#else
#define _Assert_Thread_dispatching_repressed() ( ( void ) 0 )
bool _Debug_Is_thread_dispatching_allowed( void );
#endif
/**

14
cpukit/score/src/assertthreaddispatchingrepressed.c → cpukit/score/src/debugisthreaddispatchingallowed.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013 embedded brains GmbH. All rights reserved.
* Copyright (c) 2013-2014 embedded brains GmbH. All rights reserved.
*
* embedded brains GmbH
* Dornierstr. 4
@@ -21,17 +21,17 @@
#include <rtems/score/threaddispatch.h>
#if defined( RTEMS_DEBUG )
void _Assert_Thread_dispatching_repressed( void )
bool _Debug_Is_thread_dispatching_allowed( void )
{
bool dispatch_is_disabled;
bool dispatch_allowed;
ISR_Level level;
Per_CPU_Control *per_cpu;
_ISR_Disable( level );
_ISR_Disable_without_giant( level );
per_cpu = _Per_CPU_Get_by_index( _SMP_Get_current_processor() );
dispatch_is_disabled = per_cpu->thread_dispatch_disable_level != 0;
_ISR_Enable( level );
dispatch_allowed = per_cpu->thread_dispatch_disable_level == 0;
_ISR_Enable_without_giant( level );
_Assert( dispatch_is_disabled || _ISR_Get_level() != 0 );
return dispatch_allowed && _ISR_Get_level() == 0;
}
#endif

2
cpukit/score/src/smp.c
View File

@@ -100,7 +100,7 @@ void _SMP_Broadcast_message( uint32_t message )
uint32_t ncpus = _SMP_Get_processor_count();
uint32_t cpu;
_Assert_Thread_dispatching_repressed();
_Assert( _Debug_Is_thread_dispatching_allowed() );
for ( cpu = 0 ; cpu < ncpus ; ++cpu ) {
if ( cpu != self ) {