diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-07-01 22:32:31 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-07-01 22:32:31 +0000 |
commit | 90015e7f864274881572362aa19530b608e5b540 (patch) | |
tree | 18898ad469cb28aeccefd93b79d7452767df0d59 /cpukit/rtems/src/regionreturnsegment.c | |
parent | 2002-07-01 Joel Sherrill <joel@OARcorp.com> (diff) | |
download | rtems-90015e7f864274881572362aa19530b608e5b540.tar.bz2 |
2002-07-01 Joel Sherrill <joel@OARcorp.com>
* Mega patch merge to change the format of the object IDs to
loosen the dependency between the SCORE and the various APIs.
There was considerable work to simplify the object name management
and it appears that the name_table field is no longer needed.
This patch also includes the addition of the internal mutex
which is currently only used to protect some types of allocation
and deallocation. This significantly can reduce context
switch latency under certain circumstances. In particular,
some heap/region operations were O(n) and had dispatching
disabled. This should help enormously. With this merge,
the patch is not as clean as it should be. In particular,
the documentation has not been modified to reflect the new object
ID layout, the IDs in the test screens are not updated, and
_Objects_Get_information needs to be a real routine not inlined.
As part of this patch a lot of MP code for thread/proxy blocking
was made conditional and cleaned up.
* include/rtems.h, inline/rtems/rtems/region.inl,
macros/rtems/rtems/region.inl, src/dpmem.c, src/dpmemcreate.c,
src/msg.c, src/msgqcreate.c, src/part.c, src/partcreate.c,
src/ratemon.c, src/ratemoncreate.c, src/region.c, src/regioncreate.c,
src/regiondelete.c, src/regionextend.c, src/regiongetinfo.c,
src/regiongetsegment.c, src/regiongetsegmentsize.c,
src/regionident.c, src/regionreturnsegment.c, src/rtemstimer.c,
src/sem.c, src/semcreate.c, src/taskcreate.c, src/taskident.c,
src/tasks.c, src/timercreate.c: Modified as part of above.
Diffstat (limited to 'cpukit/rtems/src/regionreturnsegment.c')
-rw-r--r-- | cpukit/rtems/src/regionreturnsegment.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/cpukit/rtems/src/regionreturnsegment.c b/cpukit/rtems/src/regionreturnsegment.c index e5174e578b..f144145afd 100644 --- a/cpukit/rtems/src/regionreturnsegment.c +++ b/cpukit/rtems/src/regionreturnsegment.c @@ -28,6 +28,7 @@ #include <rtems/rtems/region.h> #include <rtems/score/states.h> #include <rtems/score/thread.h> +#include <rtems/score/apimutex.h> /*PAGE * @@ -58,13 +59,16 @@ rtems_status_code rtems_region_return_segment( #endif int status; + _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: @@ -75,7 +79,7 @@ rtems_status_code rtems_region_return_segment( if ( _Heap_Size_of_user_area( &the_region->Memory, segment, size ) ) { memset(segment, (RTEMS_REGION_FREE_SHRED_PATTERN & 0xFF), size); } else { - _Thread_Enable_dispatch(); + _RTEMS_Unlock_allocator(); return RTEMS_INVALID_ADDRESS; } #endif @@ -85,7 +89,7 @@ rtems_status_code rtems_region_return_segment( _Region_Debug_Walk( the_region, 4 ); if ( !status ) { - _Thread_Enable_dispatch(); + _RTEMS_Unlock_allocator(); return RTEMS_INVALID_ADDRESS; } @@ -110,7 +114,7 @@ rtems_status_code rtems_region_return_segment( the_thread->Wait.return_code = RTEMS_SUCCESSFUL; } - _Thread_Enable_dispatch(); + _RTEMS_Unlock_allocator(); return RTEMS_SUCCESSFUL; } |