Changeset 9b3f187 in rtems

Timestamp:

Nov 29, 2004, 10:45:43 PM (16 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

4406c2f

Parents:

55243362

Message:

2004-11-29 Joel Sherrill <joel@…>

• 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.

Location:

cpukit

Files:

• ChangeLog (modified) (1 diff)
• libcsupport/src/mallocfreespace.c (modified) (1 diff)
• rtems/Makefile.am (modified) (1 diff)
• rtems/include/rtems/rtems/region.h (modified) (2 diffs)
• rtems/src/regiongetfreeinfo.c (added)
• score/Makefile.am (modified) (1 diff)
• score/include/rtems/score/heap.h (modified) (2 diffs)
• score/include/rtems/score/object.h (modified) (2 diffs)
• score/src/heapgetfreeinfo.c (added)
• score/src/heapgetinfo.c (modified) (2 diffs)
• score/src/objectinitializeinformation.c (modified) (2 diffs)

cpukit/ChangeLog

@@ +1 @@
+2004-11-29      Joel Sherrill <joel@OARcorp.com>
+
+        * 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.
+
 2004-11-22      Joel Sherrill <joel@OARcorp.com>
 

cpukit/libcsupport/src/mallocfreespace.c

@@ -38 +38 @@
   region_information_block   heap_info;
 
-  if ( !rtems_region_get_information( RTEMS_Malloc_Heap, &heap_info ) ) {
-    return (size_t) heap_info.free_size;
+  if ( !rtems_region_get_free_information( RTEMS_Malloc_Heap, &heap_info ) ) {
+    return (size_t) heap_info.Free.largest;
   }
   return (size_t) -1;

cpukit/rtems/Makefile.am

@@ -108 +108 @@
 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 \

cpukit/rtems/include/rtems/rtems/region.h

@@ -135 +135 @@
 
 /*
- *  rtems_region_ident
+ *  rtems_region_get_information
  *
  *  DESCRIPTION:
@@ -145 +145 @@
 
 rtems_status_code rtems_region_get_information(
+  Objects_Id              id,
+  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

cpukit/score/Makefile.am

@@ -95 +95 @@
 
 HEAP_C_FILES = src/heap.c src/heapallocate.c src/heapextend.c src/heapfree.c \
-    src/heapsizeofuserarea.c src/heapwalk.c src/heapgetinfo.c
+    src/heapsizeofuserarea.c src/heapwalk.c src/heapgetinfo.c \
+    src/heapgetfreeinfo.c
 
 OBJECT_C_FILES = src/object.c src/objectallocate.c \

cpukit/score/include/rtems/score/heap.h

@@ -56 +56 @@
 
 /**
+ *  Information block returned by the Heap routines used to
+ *  obtain statistics.  This information is returned about
+ *  either free or used blocks.
+ */
+
+typedef struct {
+  /** Number of blocks of this type. */
+  uint32_t number;
+  /** Largest blocks of this type. */
+  uint32_t largest;
+  /** Total size of the blocks of this type. */
+  uint32_t total;
+
+} Heap_Information;
+
+
+/**
  *  Information block returned by _Heap_Get_information
  */
 typedef struct {
-  /** This field is the number of free blocks in this heap. */
-  uint32_t     free_blocks;
-  /** This field is the amount of free memory in this heap. */
-  uint32_t     free_size;
-  /** This field is the number of used blocks in this heap. */
-  uint32_t     used_blocks;
-  /** This field is the amount of used memory in this heap. */
-  uint32_t     used_size;
+  /** This field is information on the used blocks in the heap. */
+  Heap_Information Free;
+  /** This field is information on the used blocks in the heap. */
+  Heap_Information Used;
 } Heap_Information_block;
 
@@ -279 +292 @@
 );
 
+/**
+ *  This heap routine returns information about the free blocks
+ *  in the specified heap.
+ *  
+ *  @param the_heap (in) pointer to heap header.
+ *  @param info (in) pointer to the free block information.
+ *  
+ *  @return free block information filled in.
+ */ 
+    
+void _Heap_Get_free_information(
+  Heap_Control        *the_heap,
+  Heap_Information    *info
+);
 
 #ifndef __RTEMS_APPLICATION__

cpukit/score/include/rtems/score/object.h

@@ -232 +232 @@
   boolean           is_string;          /* TRUE if names are strings */
   uint16_t          name_length;        /* maximum length of names */
-  Objects_Thread_queue_Extract_callout *extract;
+  Objects_Thread_queue_Extract_callout extract;
 #if defined(RTEMS_MULTIPROCESSING)
   Chain_Control    *global_table;       /* pointer to global table */
@@ -352 +352 @@
   ,
   boolean              supports_global,
-  Objects_Thread_queue_Extract_callout *extract
+  Objects_Thread_queue_Extract_callout extract
 #endif
 );

cpukit/score/src/heapgetinfo.c

@@ -41 +41 @@
   Heap_Block *next_block = 0;  /* avoid warnings */
   int         notdone = 1;
+  uint32_t    size;
 
 
-  the_info->free_blocks = 0;
-  the_info->free_size   = 0;
-  the_info->used_blocks = 0;
-  the_info->used_size   = 0;
+  the_info->Free.number  = 0;
+  the_info->Free.total   = 0;
+  the_info->Free.largest = 0;
+  the_info->Used.number  = 0;
+  the_info->Used.total   = 0;
+  the_info->Used.largest = 0;
 
   /*
@@ -73 +76 @@
        */
 
+      size = _Heap_Block_size(the_block);
       if ( _Heap_Is_block_free(the_block) ) {
-        the_info->free_blocks++;
-        the_info->free_size += _Heap_Block_size(the_block);
+        the_info->Free.number++;
+        the_info->Free.total += size;
+        if ( size > the_info->Free.largest )
+          the_info->Free.largest = size;
       } else {
-        the_info->used_blocks++;
-        the_info->used_size += _Heap_Block_size(the_block);
+        the_info->Used.number++;
+        the_info->Used.total += size;
+        if ( size > the_info->Used.largest )
+          the_info->Used.largest = size;
       }
 

cpukit/score/src/objectinitializeinformation.c

@@ -39 +39 @@
  *    When multiprocessing is configured,
  *      supports_global     - TRUE if this is a global object class
- *      extract_callout     - pointer to threadq extract callout if MP
+ *      extract_callout     - pointer to threadq extract callout
  *
  *  Output parameters:  NONE
@@ -55 +55 @@
   ,
   boolean              supports_global,
-  Objects_Thread_queue_Extract_callout *extract
+  Objects_Thread_queue_Extract_callout extract
 #endif
 )