Changeset 1f2d5df in rtems

Timestamp:

09/18/96 20:52:47 (27 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

5e9a594

Parents:

b1c215e

Message:

added malloc_walk

miscellaneous corrections in casting.

Files:

• c/src/exec/libcsupport/src/malloc.c (modified) (6 diffs)
• c/src/lib/libc/malloc.c (modified) (6 diffs)
• cpukit/libcsupport/src/malloc.c (modified) (6 diffs)

c/src/exec/libcsupport/src/malloc.c

@@ -14 +14 @@
  */
 
+#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
 #include <rtems.h>
 #include "libcsupport.h"
@@ -121 +122 @@
 }
 
+#ifdef RTEMS_NEWLIB
 void *malloc(
   size_t  size
@@ -164 +166 @@
     the_size = ((size + sbrk_amount) / sbrk_amount * sbrk_amount);
 
-    if (((rtems_unsigned32)starting_address = sbrk(the_size)) == -1)
+    if (((rtems_unsigned32)starting_address = (void *)sbrk(the_size)) == -1)
       return (void *) 0;
 
@@ -301 +303 @@
   }
 }
+/* end if RTEMS_NEWLIB */
+#endif
 
 #ifdef MALLOC_STATS
@@ -321 +325 @@
            (unsigned int) malloc_stats.max_depth / 1024,
            (malloc_stats.max_depth * 100) / malloc_stats.space_available,
-           (unsigned long long) malloc_stats.lifetime_allocated / 1024,
-           (unsigned long long) malloc_stats.lifetime_freed / 1024);
+           (unsigned64) malloc_stats.lifetime_allocated / 1024,
+           (unsigned64) malloc_stats.lifetime_freed / 1024);
     printf("  Call counts:   malloc:%d   free:%d   realloc:%d   calloc:%d\n",
            malloc_stats.malloc_calls,
@@ -328 +332 @@
            malloc_stats.realloc_calls,
            malloc_stats.calloc_calls);
-}        
+}
+
+
+void malloc_walk(size_t source, size_t printf_enabled)
+{
+   register Region_Control *the_region;
+   Objects_Locations        location;
+ 
+   the_region = _Region_Get( RTEMS_Malloc_Heap, &location );
+   if ( location == OBJECTS_LOCAL )
+   {
+      _Heap_Walk( &the_region->Memory, source, printf_enabled );
+      _Thread_Enable_dispatch();
+   }
+}
+
+#else
+
+void malloc_dump(void)
+{
+   return;
+}
+ 
+void malloc_walk(size_t source, size_t printf_enabled)
+{
+   return;
+}
+
 #endif
 

c/src/lib/libc/malloc.c

@@ -14 +14 @@
  */
 
+#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
 #include <rtems.h>
 #include "libcsupport.h"
@@ -121 +122 @@
 }
 
+#ifdef RTEMS_NEWLIB
 void *malloc(
   size_t  size
@@ -164 +166 @@
     the_size = ((size + sbrk_amount) / sbrk_amount * sbrk_amount);
 
-    if (((rtems_unsigned32)starting_address = sbrk(the_size)) == -1)
+    if (((rtems_unsigned32)starting_address = (void *)sbrk(the_size)) == -1)
       return (void *) 0;
 
@@ -301 +303 @@
   }
 }
+/* end if RTEMS_NEWLIB */
+#endif
 
 #ifdef MALLOC_STATS
@@ -321 +325 @@
            (unsigned int) malloc_stats.max_depth / 1024,
            (malloc_stats.max_depth * 100) / malloc_stats.space_available,
-           (unsigned long long) malloc_stats.lifetime_allocated / 1024,
-           (unsigned long long) malloc_stats.lifetime_freed / 1024);
+           (unsigned64) malloc_stats.lifetime_allocated / 1024,
+           (unsigned64) malloc_stats.lifetime_freed / 1024);
     printf("  Call counts:   malloc:%d   free:%d   realloc:%d   calloc:%d\n",
            malloc_stats.malloc_calls,
@@ -328 +332 @@
            malloc_stats.realloc_calls,
            malloc_stats.calloc_calls);
-}        
+}
+
+
+void malloc_walk(size_t source, size_t printf_enabled)
+{
+   register Region_Control *the_region;
+   Objects_Locations        location;
+ 
+   the_region = _Region_Get( RTEMS_Malloc_Heap, &location );
+   if ( location == OBJECTS_LOCAL )
+   {
+      _Heap_Walk( &the_region->Memory, source, printf_enabled );
+      _Thread_Enable_dispatch();
+   }
+}
+
+#else
+
+void malloc_dump(void)
+{
+   return;
+}
+ 
+void malloc_walk(size_t source, size_t printf_enabled)
+{
+   return;
+}
+
 #endif
 

cpukit/libcsupport/src/malloc.c

@@ -14 +14 @@
  */
 
+#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
 #include <rtems.h>
 #include "libcsupport.h"
@@ -121 +122 @@
 }
 
+#ifdef RTEMS_NEWLIB
 void *malloc(
   size_t  size
@@ -164 +166 @@
     the_size = ((size + sbrk_amount) / sbrk_amount * sbrk_amount);
 
-    if (((rtems_unsigned32)starting_address = sbrk(the_size)) == -1)
+    if (((rtems_unsigned32)starting_address = (void *)sbrk(the_size)) == -1)
       return (void *) 0;
 
@@ -301 +303 @@
   }
 }
+/* end if RTEMS_NEWLIB */
+#endif
 
 #ifdef MALLOC_STATS
@@ -321 +325 @@
            (unsigned int) malloc_stats.max_depth / 1024,
            (malloc_stats.max_depth * 100) / malloc_stats.space_available,
-           (unsigned long long) malloc_stats.lifetime_allocated / 1024,
-           (unsigned long long) malloc_stats.lifetime_freed / 1024);
+           (unsigned64) malloc_stats.lifetime_allocated / 1024,
+           (unsigned64) malloc_stats.lifetime_freed / 1024);
     printf("  Call counts:   malloc:%d   free:%d   realloc:%d   calloc:%d\n",
            malloc_stats.malloc_calls,
@@ -328 +332 @@
            malloc_stats.realloc_calls,
            malloc_stats.calloc_calls);
-}        
+}
+
+
+void malloc_walk(size_t source, size_t printf_enabled)
+{
+   register Region_Control *the_region;
+   Objects_Locations        location;
+ 
+   the_region = _Region_Get( RTEMS_Malloc_Heap, &location );
+   if ( location == OBJECTS_LOCAL )
+   {
+      _Heap_Walk( &the_region->Memory, source, printf_enabled );
+      _Thread_Enable_dispatch();
+   }
+}
+
+#else
+
+void malloc_dump(void)
+{
+   return;
+}
+ 
+void malloc_walk(size_t source, size_t printf_enabled)
+{
+   return;
+}
+
 #endif