[PATCH] Change the assert in _Thread_Dispatch_decrement_disable_level

[Sebastian Huber]

On 02/02/2015 07:37 PM, Martin Galvan wrote:
> While cpu_self->thread_dispatch_disable_level shouldn't ever be zero,
> it would be better to check it before doing the decrement.
>
> diff --git a/cpukit/score/src/threaddispatchdisablelevel.c
> b/cpukit/score/src/threaddispatchdisablelevel.c
> index 3b7837c..ce33db9 100644
> --- a/cpukit/score/src/threaddispatchdisablelevel.c
> +++ b/cpukit/score/src/threaddispatchdisablelevel.c
> @@ -107,11 +107,12 @@ uint32_t _Thread_Dispatch_decrement_disable_level( void )
>
>     cpu_self = _Per_CPU_Get();
>     disable_level = cpu_self->thread_dispatch_disable_level;
> +  _Assert( disable_level > 1);

This additional assert is all right.

>     --disable_level;
>     cpu_self->thread_dispatch_disable_level = disable_level;
>
>     _Giant_Do_release( cpu_self );
> -  _Assert( disable_level != 0 || _Giant.owner_cpu != cpu_self );

The assert above is correct.  Maybe this is better:

_Assert(
  ( disable_level == 0 && _Giant.owner_cpu != cpu_self )
     || ( disable_level != 0 && _Giant.owner_cpu == cpu_self )
);

> +  _Assert( _Giant.owner_cpu != cpu_self );
>
>     _Profiling_Thread_dispatch_enable( cpu_self, disable_level );
>     _ISR_Enable_without_giant( isr_level );
>


-- 
Sebastian Huber, embedded brains GmbH

Address : Dornierstr. 4, D-82178 Puchheim, Germany
Phone   : +49 89 189 47 41-16
Fax     : +49 89 189 47 41-09
E-Mail  : sebastian.huber at embedded-brains.de
PGP     : Public key available on request.

Diese Nachricht ist keine geschäftliche Mitteilung im Sinne des EHUG.