[PATCH] score: Delete superfluous Heap_Statistics::instance

Sebastian Huber sebastian.huber at embedded-brains.de
Wed Jan 21 14:24:38 UTC 2015


This value depends on the _Heap_Initialize() call sequence and carries
no useful information.
---
 cpukit/libmisc/shell/print_heapinfo.c   | 2 --
 cpukit/score/include/rtems/score/heap.h | 5 -----
 cpukit/score/src/heap.c                 | 3 ---
 doc/shell/memory.t                      | 2 --
 4 files changed, 12 deletions(-)

diff --git a/cpukit/libmisc/shell/print_heapinfo.c b/cpukit/libmisc/shell/print_heapinfo.c
index b1e34f2..f99f0a9 100644
--- a/cpukit/libmisc/shell/print_heapinfo.c
+++ b/cpukit/libmisc/shell/print_heapinfo.c
@@ -38,7 +38,6 @@ void rtems_shell_print_heap_stats(
 )
 {
   printf(
-    "Instance number:                          %12" PRIu32 "\n"
     "Size of the allocatable area in bytes:    %12" PRIuPTR "\n"
     "Minimum free size ever in bytes:          %12" PRIuPTR "\n"
     "Maximum number of free blocks ever:       %12" PRIu32 "\n"
@@ -50,7 +49,6 @@ void rtems_shell_print_heap_stats(
     "Total number of failed allocations:       %12" PRIu32 "\n"
     "Total number of successful frees:         %12" PRIu32 "\n"
     "Total number of successful resizes:       %12" PRIu32 "\n",
-    s->instance,
     s->size,
     s->min_free_size,
     s->max_free_blocks,
diff --git a/cpukit/score/include/rtems/score/heap.h b/cpukit/score/include/rtems/score/heap.h
index f20b4e6..ab627b6 100644
--- a/cpukit/score/include/rtems/score/heap.h
+++ b/cpukit/score/include/rtems/score/heap.h
@@ -271,11 +271,6 @@ typedef struct {
   uint64_t lifetime_freed;
 
   /**
-   * @brief Instance number of this heap.
-   */
-  uint32_t instance;
-
-  /**
    * @brief Size of the allocatable area in bytes.
    *
    * This value is an integral multiple of the page size.
diff --git a/cpukit/score/src/heap.c b/cpukit/score/src/heap.c
index 1550c4c..3fddb1a 100644
--- a/cpukit/score/src/heap.c
+++ b/cpukit/score/src/heap.c
@@ -31,8 +31,6 @@
   #error "invalid CPU_ALIGNMENT value"
 #endif
 
-static uint32_t instance = 0;
-
 /*
  *  _Heap_Initialize
  *
@@ -284,7 +282,6 @@ uintptr_t _Heap_Initialize(
   stats->min_free_size = first_block_size;
   stats->free_blocks = 1;
   stats->max_free_blocks = 1;
-  stats->instance = instance++;
 
   _Heap_Protection_set_delayed_free_fraction( heap, 2 );
 
diff --git a/doc/shell/memory.t b/doc/shell/memory.t
index cda7ced..5cd371a 100644
--- a/doc/shell/memory.t
+++ b/doc/shell/memory.t
@@ -546,7 +546,6 @@ to the command.  This includes the following information:
 @item Number of used blocks
 @item Largest used block
 @item Total bytes used
- at item Instance number
 @item Size of the allocatable area in bytes
 @item Minimum free size ever in bytes
 @item Maximum number of free blocks ever
@@ -584,7 +583,6 @@ Total bytes free:                            266208392
 Number of used blocks:                             167
 Largest used block:                              16392
 Total bytes used:                                83536
-Instance number:                                     0
 Size of the allocatable area in bytes:       266291928
 Minimum free size ever in bytes:             266207360
 Maximum number of free blocks ever:                  6
-- 
1.8.4.5



More information about the devel mailing list