summaryrefslogtreecommitdiffstats
path: root/cpukit/rtems/src/regionresizesegment.c
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2016-04-08 06:56:46 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2016-04-12 07:36:19 +0200
commit1142f5593a5b6ab65d47bafb749e0709c7d2daa2 (patch)
tree44d5b886a880307bd6f38550a7275071f38965a7 /cpukit/rtems/src/regionresizesegment.c
parentscore: Simplify _Objects_Get_no_protection() (diff)
downloadrtems-1142f5593a5b6ab65d47bafb749e0709c7d2daa2.tar.bz2
rtems: Add and use _Region_Get_and_lock()
Get region and lock allocator in _Region_Get_and_lock() in case the region exists and unlock it in _Region_Unlock().
Diffstat (limited to 'cpukit/rtems/src/regionresizesegment.c')
-rw-r--r--cpukit/rtems/src/regionresizesegment.c50
1 files changed, 24 insertions, 26 deletions
diff --git a/cpukit/rtems/src/regionresizesegment.c b/cpukit/rtems/src/regionresizesegment.c
index a21d1b9d44..303fce496f 100644
--- a/cpukit/rtems/src/regionresizesegment.c
+++ b/cpukit/rtems/src/regionresizesegment.c
@@ -37,38 +37,36 @@ rtems_status_code rtems_region_resize_segment(
return RTEMS_INVALID_ADDRESS;
}
- _RTEMS_Lock_allocator();
+ the_region = _Region_Get_and_lock( id );
- the_region = _Region_Get( id );
+ if ( the_region == NULL ) {
+ return RTEMS_INVALID_ID;
+ }
- if ( the_region != NULL ) {
- resize_status = _Heap_Resize_block(
- &the_region->Memory,
- segment,
- (uint32_t) size,
- &osize,
- &avail_size
- );
- *old_size = (uint32_t) osize;
+ resize_status = _Heap_Resize_block(
+ &the_region->Memory,
+ segment,
+ (uint32_t) size,
+ &osize,
+ &avail_size
+ );
+ *old_size = (uint32_t) osize;
- switch ( resize_status ) {
- case HEAP_RESIZE_SUCCESSFUL:
- /* Unlocks allocator */
- _Region_Process_queue( the_region );
- return RTEMS_SUCCESSFUL;
+ switch ( resize_status ) {
+ case HEAP_RESIZE_SUCCESSFUL:
+ /* Unlocks allocator */
+ _Region_Process_queue( the_region );
+ return RTEMS_SUCCESSFUL;
- case HEAP_RESIZE_UNSATISFIED:
- status = RTEMS_UNSATISFIED;
- break;
+ case HEAP_RESIZE_UNSATISFIED:
+ status = RTEMS_UNSATISFIED;
+ break;
- default:
- status = RTEMS_INVALID_ADDRESS;
- break;
- }
- } else {
- status = RTEMS_INVALID_ID;
+ default:
+ status = RTEMS_INVALID_ADDRESS;
+ break;
}
- _RTEMS_Unlock_allocator();
+ _Region_Unlock( the_region );
return status;
}