change log for rtems (2010-06-30)

rtems-vc at rtems.org rtems-vc at rtems.org
Wed Jun 30 16:12:37 UTC 2010


 *joel*:
2010-06-30	Joel Sherrill <joel.sherrilL at OARcorp.com>

	PR 1472/cpukit
	* libcsupport/Makefile.am, libcsupport/include/rtems/malloc.h,
	libcsupport/src/free.c, libcsupport/src/malloc.c,
	libcsupport/src/malloc_initialize.c, libcsupport/src/realloc.c,
	libcsupport/src/rtems_memalign.c: Remove malloc boundary code. It has
	not been used since before 4.6 and is bitrotted.
	* libcsupport/src/malloc_boundary.c: Removed.

M 1.2476  cpukit/ChangeLog
M  1.123  cpukit/libcsupport/Makefile.am
M   1.11  cpukit/libcsupport/include/rtems/malloc.h
M    1.9  cpukit/libcsupport/src/free.c
M   1.59  cpukit/libcsupport/src/malloc.c
R    1.9  cpukit/libcsupport/src/malloc_boundary.c
M   1.12  cpukit/libcsupport/src/malloc_initialize.c
M    1.7  cpukit/libcsupport/src/realloc.c
M    1.4  cpukit/libcsupport/src/rtems_memalign.c

diff -u rtems/cpukit/ChangeLog:1.2475 rtems/cpukit/ChangeLog:1.2476
--- rtems/cpukit/ChangeLog:1.2475	Wed Jun 30 08:58:55 2010
+++ rtems/cpukit/ChangeLog	Wed Jun 30 10:36:47 2010
@@ -1,3 +1,13 @@
+2010-06-30	Joel Sherrill <joel.sherrilL at OARcorp.com>
+
+	PR 1472/cpukit
+	* libcsupport/Makefile.am, libcsupport/include/rtems/malloc.h,
+	libcsupport/src/free.c, libcsupport/src/malloc.c,
+	libcsupport/src/malloc_initialize.c, libcsupport/src/realloc.c,
+	libcsupport/src/rtems_memalign.c: Remove malloc boundary code. It has
+	not been used since before 4.6 and is bitrotted.
+	* libcsupport/src/malloc_boundary.c: Removed.
+
 2010-06-30	Jennifer.Averett <Jennifer.Averett at OARcorp.com>
 
 	* libcsupport/include/rtems/libio.h, libfs/Makefile.am: Added

diff -u rtems/cpukit/libcsupport/Makefile.am:1.122 rtems/cpukit/libcsupport/Makefile.am:1.123
--- rtems/cpukit/libcsupport/Makefile.am:1.122	Tue Jun 22 15:03:41 2010
+++ rtems/cpukit/libcsupport/Makefile.am	Wed Jun 30 10:36:47 2010
@@ -89,10 +89,9 @@
     src/_realloc_r.c src/__brk.c src/__sbrk.c src/mallocfreespace.c \
     src/mallocinfo.c src/malloc_walk.c src/malloc_get_statistics.c \
     src/malloc_report_statistics.c src/malloc_report_statistics_plugin.c \
-    src/malloc_statistics_helpers.c src/malloc_boundary.c \
-    src/posix_memalign.c src/rtems_memalign.c src/malloc_deferred.c \
-    src/malloc_sbrk_helpers.c src/malloc_dirtier.c src/malloc_p.h \
-    src/rtems_malloc.c
+    src/malloc_statistics_helpers.c src/posix_memalign.c \
+    src/rtems_memalign.c src/malloc_deferred.c src/malloc_sbrk_helpers.c \
+    src/malloc_dirtier.c src/malloc_p.h src/rtems_malloc.c
 
 PASSWORD_GROUP_C_FILES = src/getpwent.c
 

diff -u rtems/cpukit/libcsupport/include/rtems/malloc.h:1.10 rtems/cpukit/libcsupport/include/rtems/malloc.h:1.11
--- rtems/cpukit/libcsupport/include/rtems/malloc.h:1.10	Mon Jun 21 16:13:42 2010
+++ rtems/cpukit/libcsupport/include/rtems/malloc.h	Wed Jun 30 10:36:48 2010
@@ -56,20 +56,6 @@
 extern rtems_malloc_statistics_functions_t *rtems_malloc_statistics_helpers;
 
 /*
- *  Malloc boundary support plugin
- */
-typedef struct {
-  void     (*initialize)(void);
-  uint32_t (*overhead)(void);
-  void     (*at_malloc)(void *, size_t);
-  void     (*at_free)(void *);
-  void     (*at_realloc)(void *, size_t);
-} rtems_malloc_boundary_functions_t;
-
-extern rtems_malloc_boundary_functions_t rtems_malloc_boundary_helpers_table;
-extern rtems_malloc_boundary_functions_t *rtems_malloc_boundary_helpers;
-
-/*
  *  Malloc Heap Extension (sbrk) plugin
  */
 typedef struct {

diff -u rtems/cpukit/libcsupport/src/free.c:1.8 rtems/cpukit/libcsupport/src/free.c:1.9
--- rtems/cpukit/libcsupport/src/free.c:1.8	Sun Nov 29 07:35:32 2009
+++ rtems/cpukit/libcsupport/src/free.c	Wed Jun 30 10:36:48 2010
@@ -35,21 +35,12 @@
   /*
    *  Do not attempt to free memory if in a critical section or ISR.
    */
-
   if ( _System_state_Is_up(_System_state_Get()) &&
        !malloc_is_system_state_OK() ) {
       malloc_deferred_free(ptr);
       return;
   }
 
-  #if defined(RTEMS_MALLOC_BOUNDARY_HELPERS)
-    /*
-     *  If configured, check the boundary area
-     */
-    if ( rtems_malloc_boundary_helpers )
-      (*rtems_malloc_boundary_helpers->at_free)(ptr);
-  #endif
-
   /*
    *  If configured, update the statistics
    */

diff -u rtems/cpukit/libcsupport/src/malloc.c:1.58 rtems/cpukit/libcsupport/src/malloc.c:1.59
--- rtems/cpukit/libcsupport/src/malloc.c:1.58	Sun Nov 29 07:35:32 2009
+++ rtems/cpukit/libcsupport/src/malloc.c	Wed Jun 30 10:36:48 2010
@@ -55,15 +55,6 @@
     _Protected_heap_Walk( RTEMS_Malloc_Heap, 0, false );
   #endif
 
-  #if defined(RTEMS_MALLOC_BOUNDARY_HELPERS)
-    /*
-     *  If the support for a boundary area at the end of the heap
-     *  block allocated is turned on, then adjust the size.
-     */
-    if (rtems_malloc_boundary_helpers)
-      size += (*rtems_malloc_boundary_helpers->overhead)();
-  #endif
-
   /*
    * Try to give a segment in the current heap if there is not
    * enough space then try to grow the heap.
@@ -93,14 +84,6 @@
   if ( rtems_malloc_statistics_helpers )
     (*rtems_malloc_statistics_helpers->at_malloc)(return_this);
 
-  #if defined(RTEMS_MALLOC_BOUNDARY_HELPERS)
-    /*
-     * If configured, set the boundary area
-     */
-    if (rtems_malloc_boundary_helpers)
-      (*rtems_malloc_boundary_helpers->at_malloc)(return_this, size);
-  #endif
-
   return return_this;
 }
 

diff -u rtems/cpukit/libcsupport/src/malloc_initialize.c:1.11 rtems/cpukit/libcsupport/src/malloc_initialize.c:1.12
--- rtems/cpukit/libcsupport/src/malloc_initialize.c:1.11	Sun Nov 29 07:35:32 2009
+++ rtems/cpukit/libcsupport/src/malloc_initialize.c	Wed Jun 30 10:36:48 2010
@@ -43,15 +43,6 @@
   size_t sbrk_amount
 )
 {
-  #if defined(RTEMS_MALLOC_BOUNDARY_HELPERS)
-    /*
-     *  If configured, initialize the boundary support
-     */
-    if ( rtems_malloc_boundary_helpers != NULL ) {
-      (*rtems_malloc_boundary_helpers->initialize)();
-    }
-  #endif
-
   /*
    *  If configured, initialize the statistics support
    */

diff -u rtems/cpukit/libcsupport/src/realloc.c:1.6 rtems/cpukit/libcsupport/src/realloc.c:1.7
--- rtems/cpukit/libcsupport/src/realloc.c:1.6	Mon Sep 14 09:48:38 2009
+++ rtems/cpukit/libcsupport/src/realloc.c	Wed Jun 30 10:36:48 2010
@@ -27,7 +27,6 @@
 {
   uintptr_t old_size;
   char    *new_area;
-  uintptr_t resize;
 
   MSBUMP(realloc_calls, 1);
 
@@ -60,23 +59,9 @@
   }
 
   /*
-   *  If block boundary integrity checking is enabled, then
-   *  we need to account for the boundary memory again.
+   *  Now resize it.
    */
-  resize = size;
-  #if defined(RTEMS_MALLOC_BOUNDARY_HELPERS)
-    if (rtems_malloc_boundary_helpers)
-      resize += (*rtems_malloc_boundary_helpers->overhead)();
-  #endif
-
-  if ( _Protected_heap_Resize_block( RTEMS_Malloc_Heap, ptr, resize ) ) {
-    #if defined(RTEMS_MALLOC_BOUNDARY_HELPERS)
-      /*
-       *  Successful resize.  Update the boundary on the same block.
-       */
-      if (rtems_malloc_boundary_helpers)
-        (*rtems_malloc_boundary_helpers->at_realloc)(ptr, resize);
-    #endif
+  if ( _Protected_heap_Resize_block( RTEMS_Malloc_Heap, ptr, size ) ) {
     return ptr;
   }
 

diff -u rtems/cpukit/libcsupport/src/rtems_memalign.c:1.3 rtems/cpukit/libcsupport/src/rtems_memalign.c:1.4
--- rtems/cpukit/libcsupport/src/rtems_memalign.c:1.3	Sun Nov 29 07:35:32 2009
+++ rtems/cpukit/libcsupport/src/rtems_memalign.c	Wed Jun 30 10:36:48 2010
@@ -45,24 +45,13 @@
     return EINVAL;
 
   /*
-   *
    *  If some free's have been deferred, then do them now.
    */
   malloc_deferred_frees_process();
 
-  #if defined(RTEMS_MALLOC_BOUNDARY_HELPERS)
-    /*
-     *  If the support for a boundary area at the end of the heap
-     *  block allocated is turned on, then adjust the size.
-     */
-    if (rtems_malloc_boundary_helpers)
-      size += (*rtems_malloc_boundary_helpers->overhead)();
-  #endif
-
   /*
    *  Perform the aligned allocation requested
    */
-
   return_this = _Protected_heap_Allocate_aligned(
     RTEMS_Malloc_Heap,
     size,



--

Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20100630/11524fec/attachment.html>


More information about the vc mailing list