diff options
Diffstat (limited to 'cpukit/rtems/src/regiongetsegment.c')
| -rw-r--r-- | cpukit/rtems/src/regiongetsegment.c | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/cpukit/rtems/src/regiongetsegment.c b/cpukit/rtems/src/regiongetsegment.c index ec0c52519b..dc17b21956 100644 --- a/cpukit/rtems/src/regiongetsegment.c +++ b/cpukit/rtems/src/regiongetsegment.c @@ -24,6 +24,18 @@ #include <rtems/score/threadqimpl.h> #include <rtems/score/statesimpl.h> +static void _Region_Enqueue_callout( + Thread_queue_Queue *queue, + Thread_Control *the_thread, + Thread_queue_Context *queue_context +) +{ + Region_Control *the_region; + + the_region = REGION_OF_THREAD_QUEUE_QUEUE( queue ); + _Region_Unlock( the_region ); +} + rtems_status_code rtems_region_get_segment( rtems_id id, uintptr_t size, @@ -64,35 +76,29 @@ rtems_status_code rtems_region_get_segment( } else if ( _Options_Is_no_wait( option_set ) ) { status = RTEMS_UNSATISFIED; } else { - Per_CPU_Control *cpu_self; - Thread_Control *executing; - - /* - * Switch from using the memory allocation mutex to using a - * dispatching disabled critical section. We have to do this - * because this thread is going to block. - */ - /* FIXME: This is a home grown condition variable */ - cpu_self = _Thread_Dispatch_disable(); - _Region_Unlock( the_region ); + Thread_queue_Context queue_context; + Thread_Control *executing; - executing = _Per_CPU_Get_executing( cpu_self ); + _Thread_queue_Context_initialize( &queue_context ); + _Thread_queue_Acquire( &the_region->Wait_queue, &queue_context ); + executing = _Thread_Executing; executing->Wait.count = size; executing->Wait.return_argument = segment; - _Thread_queue_Enqueue( - &the_region->Wait_queue, + /* FIXME: This is a home grown condition variable */ + _Thread_queue_Context_set_enqueue_callout( + &queue_context, + _Region_Enqueue_callout + ); + _Thread_queue_Context_set_relative_timeout( &queue_context, timeout ); + _Thread_queue_Enqueue_critical( + &the_region->Wait_queue.Queue, the_region->wait_operations, executing, STATES_WAITING_FOR_SEGMENT, - timeout, - WATCHDOG_RELATIVE, - 2 + &queue_context ); - - _Thread_Dispatch_enable( cpu_self ); - return _Status_Get_after_wait( executing ); } } |