summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Galvan <martin.galvan@tallertechnologies.com>2015-03-27 10:08:10 -0300
committerSebastian Huber <sebastian.huber@embedded-brains.de>2015-04-17 11:03:02 +0200
commit41b37e00734f8144ee2a96a94421e12e0b4c20ea (patch)
tree67ba5613df07ecbcf99afeb79b8c8374ab08197f
parentsptests/sp52: Reduce clock tick interval (diff)
downloadrtems-41b37e00734f8144ee2a96a94421e12e0b4c20ea.tar.bz2
score: Improve assert
While cpu_self->thread_dispatch_disable_level shouldn't ever be zero, it would be better to check it before doing the decrement.
-rw-r--r--cpukit/score/src/threaddispatchdisablelevel.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/cpukit/score/src/threaddispatchdisablelevel.c b/cpukit/score/src/threaddispatchdisablelevel.c
index 158fc39ae2..f78eb52016 100644
--- a/cpukit/score/src/threaddispatchdisablelevel.c
+++ b/cpukit/score/src/threaddispatchdisablelevel.c
@@ -107,11 +107,15 @@ uint32_t _Thread_Dispatch_decrement_disable_level( void )
cpu_self = _Per_CPU_Get();
disable_level = cpu_self->thread_dispatch_disable_level;
+ _Assert( disable_level > 0);
--disable_level;
cpu_self->thread_dispatch_disable_level = disable_level;
_Giant_Do_release( cpu_self );
- _Assert( disable_level != 0 || _Giant.owner_cpu != cpu_self );
+ _Assert(
+ ( disable_level == 0 && _Giant.owner_cpu != cpu_self )
+ || ( disable_level != 0 && _Giant.owner_cpu == cpu_self )
+ );
_Profiling_Thread_dispatch_enable( cpu_self, disable_level );
_ISR_Enable_without_giant( isr_level );