From 9b3f187a02049d81a63bb85497c5a4ebb9d37a97 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 29 Nov 2004 22:45:43 +0000 Subject: 2004-11-29 Joel Sherrill * libcsupport/src/mallocfreespace.c, rtems/Makefile.am, rtems/include/rtems/rtems/region.h, score/Makefile.am, score/include/rtems/score/heap.h, score/src/heapgetinfo.c: Add capability to return information about just the free blocks in a region or heap. Also changed the semantics of free space available to be the largest block of memory that can be allocated. * rtems/src/regiongetfreeinfo.c, score/src/heapgetfreeinfo.c: New files. : score/include/rtems/score/object.h, score/src/objectinitializeinformation.c: Remove warning. --- cpukit/rtems/Makefile.am | 3 +- cpukit/rtems/include/rtems/rtems/region.h | 17 ++++++- cpukit/rtems/src/regiongetfreeinfo.c | 78 +++++++++++++++++++++++++++++++ 3 files changed, 96 insertions(+), 2 deletions(-) create mode 100644 cpukit/rtems/src/regiongetfreeinfo.c (limited to 'cpukit/rtems') diff --git a/cpukit/rtems/Makefile.am b/cpukit/rtems/Makefile.am index 35f89a6a80..8f82d7ffa0 100644 --- a/cpukit/rtems/Makefile.am +++ b/cpukit/rtems/Makefile.am @@ -107,7 +107,8 @@ SIGNAL_C_FILES = src/signal.c src/signalcatch.c src/signalsend.c REGION_C_FILES = src/region.c src/regioncreate.c src/regiondelete.c \ src/regionextend.c src/regiongetsegment.c src/regiongetsegmentsize.c \ - src/regionident.c src/regionreturnsegment.c src/regiongetinfo.c + src/regionident.c src/regionreturnsegment.c src/regiongetinfo.c \ + src/regiongetfreeinfo.c PARTITION_C_FILES = src/part.c src/partcreate.c src/partdelete.c \ src/partgetbuffer.c src/partident.c src/partreturnbuffer.c diff --git a/cpukit/rtems/include/rtems/rtems/region.h b/cpukit/rtems/include/rtems/rtems/region.h index 259a0eb75c..acd333ec6d 100644 --- a/cpukit/rtems/include/rtems/rtems/region.h +++ b/cpukit/rtems/include/rtems/rtems/region.h @@ -134,7 +134,7 @@ rtems_status_code rtems_region_ident( ); /* - * rtems_region_ident + * rtems_region_get_information * * DESCRIPTION: * @@ -148,6 +148,21 @@ rtems_status_code rtems_region_get_information( Heap_Information_block *the_info ); +/* + * rtems_region_get_free_information + * + * DESCRIPTION: + * + * This routine implements the rtems_region_get_free_information directive. + * This directive returns information about the free blocks in the + * heap associated with this region. + */ + +rtems_status_code rtems_region_get_free_information( + Objects_Id id, + Heap_Information_block *the_info +); + /* * rtems_region_delete * diff --git a/cpukit/rtems/src/regiongetfreeinfo.c b/cpukit/rtems/src/regiongetfreeinfo.c new file mode 100644 index 0000000000..282d92dd1c --- /dev/null +++ b/cpukit/rtems/src/regiongetfreeinfo.c @@ -0,0 +1,78 @@ +/* + * 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 +#include +#include +#include +#include +#include +#include +#include +#include + +/*PAGE + * + * rtems_region_get_free_information + * + * This directive will return information about the free blocks + * in the region specified. Information about the used blocks + * will be returned as zero. + * + * Input parameters: + * id - region id + * the_info - pointer to region information block + * + * Output parameters: + * *the_info - region information block filled in + * RTEMS_SUCCESSFUL - if successful + * error code - if unsuccessful + */ + +rtems_status_code rtems_region_get_free_information( + Objects_Id id, + Heap_Information_block *the_info +) +{ + register Region_Control *the_region; + Objects_Locations location; + + if ( !the_info ) + 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: + + the_info->Used.number = 0; + the_info->Used.total = 0; + the_info->Used.largest = 0; + + _Heap_Get_free_information( &the_region->Memory, &the_info->Free ); + + _RTEMS_Unlock_allocator(); + return RTEMS_INVALID_ADDRESS; + } + + return RTEMS_INTERNAL_ERROR; /* unreached - only to remove warnings */ +} -- cgit v1.2.3