diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-27 14:43:19 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-30 16:16:21 +0200 |
| commit | 93306058c0417b1c6e950b44ef279e096062dfba (patch) | |
| tree | 1a3326d052169d2aec4c4acdd894589d5d84614c /cpukit/score/src/coremsgseize.c | |
| parent | score: Add _Thread_queue_Context_set_MP_callout() (diff) | |
| download | rtems-93306058c0417b1c6e950b44ef279e096062dfba.tar.bz2 | |
score: _CORE_mutex_Check_dispatch_for_seize()
Move the safety check performed by
_CORE_mutex_Check_dispatch_for_seize() out of the performance critical
path and generalize it. Blocking on a thread queue with an unexpected
thread dispatch disabled level is illegal in all system states.
Add the expected thread dispatch disable level (which may be 1 or 2
depending on the operation) to Thread_queue_Context and use it in
_Thread_queue_Enqueue_critical().
Diffstat (limited to 'cpukit/score/src/coremsgseize.c')
| -rw-r--r-- | cpukit/score/src/coremsgseize.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpukit/score/src/coremsgseize.c b/cpukit/score/src/coremsgseize.c index 00ff437e01..6906328039 100644 --- a/cpukit/score/src/coremsgseize.c +++ b/cpukit/score/src/coremsgseize.c @@ -114,13 +114,14 @@ Status_Control _CORE_message_queue_Seize( executing->Wait.return_argument = size_p; /* Wait.count will be filled in with the message priority */ + _Thread_queue_Context_set_expected_level( queue_context, 1 ); _Thread_queue_Enqueue_critical( &the_message_queue->Wait_queue.Queue, the_message_queue->operations, executing, STATES_WAITING_FOR_MESSAGE, timeout, - &queue_context->Lock_context + queue_context ); return _Thread_Wait_get_status( executing ); } |