diff options
Diffstat (limited to 'cpukit/rtems/src')
-rw-r--r-- | cpukit/rtems/src/regionprocessqueue.c | 83 | ||||
-rw-r--r-- | cpukit/rtems/src/regionresizesegment.c | 101 | ||||
-rw-r--r-- | cpukit/rtems/src/regionreturnsegment.c | 37 |
3 files changed, 186 insertions, 35 deletions
diff --git a/cpukit/rtems/src/regionprocessqueue.c b/cpukit/rtems/src/regionprocessqueue.c new file mode 100644 index 0000000000..6fdb216989 --- /dev/null +++ b/cpukit/rtems/src/regionprocessqueue.c @@ -0,0 +1,83 @@ +/* + * Region Manager + * + * + * COPYRIGHT (c) 1989-1999. + * On-Line Applications Research Corporation (OAR). + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + * + * $Id$ + */ + +#include <rtems/system.h> +#include <rtems/rtems/status.h> +#include <rtems/rtems/support.h> +#include <rtems/score/object.h> +#include <rtems/rtems/options.h> +#include <rtems/rtems/region.h> +#include <rtems/score/states.h> +#include <rtems/score/thread.h> +#include <rtems/score/apimutex.h> + +/*PAGE + * + * _Region_Process_queue + * + * If enough memory is available to satisfy the rtems_region_get_segment of + * the first blocked task, then that task and as many subsequent tasks as + * possible will be unblocked with their requests satisfied. + * + * Input parameters: + * the_region - the region + * + * Output parameters: + * none + */ + +void _Region_Process_queue( + Region_Control *the_region +) +{ + Thread_Control *the_thread; + void *the_segment; + /* + * Switch from using the memory allocation mutex to using a + * dispatching disabled critical section. We have to do this + * because this thread may unblock one or more threads that were + * waiting on memory. + * + * NOTE: Be sure to disable dispatching before unlocking the mutex + * since we do not want to open a window where a context + * switch could occur. + */ + _Thread_Disable_dispatch(); + _RTEMS_Unlock_allocator(); + + /* + * NOTE: The following loop is O(n) where n is the number of + * threads whose memory request is satisfied. + */ + for ( ; ; ) { + the_thread = _Thread_queue_First( &the_region->Wait_queue ); + + if ( the_thread == NULL ) + break; + + the_segment = (void **) _Region_Allocate_segment( + the_region, + the_thread->Wait.count + ); + + if ( the_segment == NULL ) + break; + + *(void **)the_thread->Wait.return_argument = the_segment; + the_region->number_of_used_blocks += 1; + _Thread_queue_Extract( &the_region->Wait_queue, the_thread ); + the_thread->Wait.return_code = RTEMS_SUCCESSFUL; + } + _Thread_Enable_dispatch(); +} diff --git a/cpukit/rtems/src/regionresizesegment.c b/cpukit/rtems/src/regionresizesegment.c new file mode 100644 index 0000000000..b83ed2c6e6 --- /dev/null +++ b/cpukit/rtems/src/regionresizesegment.c @@ -0,0 +1,101 @@ +/* + * Region Manager + * + * + * COPYRIGHT (c) 1989-1999. + * On-Line Applications Research Corporation (OAR). + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + * + * $Id$ + */ + +#if HAVE_CONFIG_H +#include "config.h" +#endif + +#include <rtems/system.h> +#include <rtems/rtems/status.h> +#include <rtems/rtems/support.h> +#include <rtems/score/object.h> +#include <rtems/rtems/options.h> +#include <rtems/rtems/region.h> +#include <rtems/score/states.h> +#include <rtems/score/thread.h> +#include <rtems/score/apimutex.h> + +/*PAGE + * + * rtems_region_resize_segment + * + * This directive will try to resize segment to the new size 'size' + * "in place". + * + * Input parameters: + * id - region id + * segment - pointer to segment address + * size - new required size + * + * Output parameters: + * RTEMS_SUCCESSFUL - if successful + * error code - if unsuccessful + */ + +rtems_status_code rtems_region_resize_segment( + Objects_Id id, + void *segment, + size_t size, + size_t *old_size +) +{ + register Region_Control *the_region; + Objects_Locations location; + Heap_Resize_status status; + uint32_t avail_size; + uint32_t osize; + + if ( !old_size ) + return RTEMS_INVALID_ADDRESS; + + _RTEMS_Lock_allocator(); + the_region = _Region_Get( id, &location ); + switch ( location ) { + + case OBJECTS_REMOTE: /* this error cannot be returned */ + _RTEMS_Unlock_allocator(); + return RTEMS_INTERNAL_ERROR; + + case OBJECTS_ERROR: + _RTEMS_Unlock_allocator(); + return RTEMS_INVALID_ID; + + case OBJECTS_LOCAL: + + _Region_Debug_Walk( the_region, 7 ); + + status = _Heap_Resize_block( + &the_region->Memory, + segment, + (uint32_t) size, + &osize, + &avail_size + ); + *old_size = (uint32_t) osize; + + _Region_Debug_Walk( the_region, 8 ); + + if( status == HEAP_RESIZE_SUCCESSFUL && avail_size > 0 ) + _Region_Process_queue( the_region ); /* unlocks allocator internally */ + else + _RTEMS_Unlock_allocator(); + + return + (status == HEAP_RESIZE_SUCCESSFUL) ? RTEMS_SUCCESSFUL : + (status == HEAP_RESIZE_UNSATISFIED) ? RTEMS_UNSATISFIED : + RTEMS_INVALID_ADDRESS; + } + + return RTEMS_INTERNAL_ERROR; /* unreached - only to remove warnings */ +} diff --git a/cpukit/rtems/src/regionreturnsegment.c b/cpukit/rtems/src/regionreturnsegment.c index ad8037fe6b..dc080e5ed5 100644 --- a/cpukit/rtems/src/regionreturnsegment.c +++ b/cpukit/rtems/src/regionreturnsegment.c @@ -55,9 +55,7 @@ rtems_status_code rtems_region_return_segment( ) { register Region_Control *the_region; - Thread_Control *the_thread; Objects_Locations location; - void **the_segment; #ifdef RTEMS_REGION_FREE_SHRED_PATTERN uint32_t size; #endif @@ -81,7 +79,7 @@ rtems_status_code rtems_region_return_segment( #ifdef RTEMS_REGION_FREE_SHRED_PATTERN if ( _Heap_Size_of_user_area( &the_region->Memory, segment, &size ) ) { - memset(segment, (RTEMS_REGION_FREE_SHRED_PATTERN & 0xFF), size); + memset( segment, (RTEMS_REGION_FREE_SHRED_PATTERN & 0xFF), size ); } else { _RTEMS_Unlock_allocator(); return RTEMS_INVALID_ADDRESS; @@ -99,38 +97,7 @@ rtems_status_code rtems_region_return_segment( the_region->number_of_used_blocks -= 1; - /* - * Switch from using the memory allocation mutex to using a - * dispatching disabled critical section. We have to do this - * because this thread may unblock one or more threads that were - * waiting on memory. - * - * NOTE: The following loop is O(n) where n is the number of - * threads whose memory request is satisfied. - */ - _RTEMS_Unlock_allocator(); - _Thread_Disable_dispatch(); - - for ( ; ; ) { - the_thread = _Thread_queue_First( &the_region->Wait_queue ); - - if ( the_thread == NULL ) - break; - - the_segment = (void **) _Region_Allocate_segment( - the_region, - the_thread->Wait.count - ); - - if ( the_segment == NULL ) - break; - - *(void **)the_thread->Wait.return_argument = the_segment; - the_region->number_of_used_blocks += 1; - _Thread_queue_Extract( &the_region->Wait_queue, the_thread ); - the_thread->Wait.return_code = RTEMS_SUCCESSFUL; - } - _Thread_Enable_dispatch(); + _Region_Process_queue(the_region); /* unlocks allocator internally */ return RTEMS_SUCCESSFUL; } |