score: Add _Objects_Put_for_get_isr_disable()

Provide SMP support.  The ISR disable/enable is not enough to ensure
mutual exclusion for SMP configurations.
This commit is contained in:
Sebastian Huber
2013-06-07 17:06:38 +02:00
parent c398c6603a
commit 54e9216a0e
4 changed files with 23 additions and 0 deletions
+1
View File
@@ -59,6 +59,7 @@ int _POSIX_Mutex_Lock_support(
timeout,
level
);
_Objects_Put_for_get_isr_disable( &the_mutex->Object );
return _POSIX_Mutex_Translate_core_mutex_return_code(
(CORE_mutex_Status) _Thread_Executing->Wait.return_code
);
+2
View File
@@ -60,6 +60,7 @@ rtems_status_code rtems_semaphore_obtain(
timeout,
level
);
_Objects_Put_for_get_isr_disable( &the_semaphore->Object );
return _Semaphore_Translate_core_mutex_return_code(
_Thread_Executing->Wait.return_code );
}
@@ -72,6 +73,7 @@ rtems_status_code rtems_semaphore_obtain(
timeout,
level
);
_Objects_Put_for_get_isr_disable( &the_semaphore->Object );
return _Semaphore_Translate_core_semaphore_return_code(
_Thread_Executing->Wait.return_code );
@@ -375,4 +375,18 @@ RTEMS_INLINE_ROUTINE bool _Objects_Is_unlimited( uint32_t maximum )
((Objects_Maximum) ((maximum) & ~OBJECTS_UNLIMITED_OBJECTS))
#endif
/**
* @brief Puts back an object obtained with _Objects_Get_isr_disable().
*/
RTEMS_INLINE_ROUTINE void _Objects_Put_for_get_isr_disable(
Objects_Control *the_object
)
{
(void) the_object;
#if defined(RTEMS_SMP)
_Thread_Enable_dispatch();
#endif
}
/* end of include file */
+6
View File
@@ -44,6 +44,9 @@ Objects_Control *_Objects_Get_isr_disable(
index = id - information->minimum_id + 1;
if ( information->maximum >= index ) {
#if defined(RTEMS_SMP)
_Thread_Disable_dispatch();
#endif
_ISR_Disable( level );
if ( (the_object = information->local_table[ index ]) != NULL ) {
*location = OBJECTS_LOCAL;
@@ -51,6 +54,9 @@ Objects_Control *_Objects_Get_isr_disable(
return the_object;
}
_ISR_Enable( level );
#if defined(RTEMS_SMP)
_Thread_Enable_dispatch();
#endif
*location = OBJECTS_ERROR;
return NULL;
}