Changeset aab4664d in rtems for cpukit/libcsupport/src/malloc.c

Timestamp:

10/22/03 16:53:55 (19 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

a51735c

Parents:

08c09e24

Message:

2003-10-22 Joel Sherrill <joel@…>

PR 511/filesystem

• src/malloc.c: Add deferred free and protect against C Program Heap operations while in a dispatch disable critical section or ISR.

File:

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

cpukit/libcsupport/src/malloc.c

@@ -34 +34 @@
 #include <unistd.h>    /* sbrk(2) */
 
+#include <chain.h>
+
+Chain_Control RTEMS_Malloc_GC_list;
+
 rtems_id RTEMS_Malloc_Heap;
 size_t RTEMS_Malloc_Sbrk_amount;
@@ -72 +76 @@
 
   /*
+   *  Initialize the garbage collection list to start with nothing on it.
+   */
+  Chain_Initialize_empty(&RTEMS_Malloc_GC_list);
+
+  /*
    * If the starting address is 0 then we are to attempt to
    * get length worth of memory using sbrk. Make sure we
@@ -151 +160 @@
   rtems_unsigned32   sbrk_amount;
   rtems_status_code  status;
+  Chain_Node        *to_be_freed;
 
   MSBUMP(malloc_calls, 1);
@@ -156 +166 @@
   if ( !size )
     return (void *) 0;
+
+  /*
+   *  Do not attempt to allocate memory if in a critical section or ISR.
+   */
+
+  if (_Thread_Dispatch_disable_level > 0)
+    return (void *) 0;
+ 
+  if (_ISR_Nest_level > 0)
+    return (void *) 0;
+ 
+  /*
+   *  If some free's have been deferred, then do them now.
+   */
+  while ((to_be_freed = Chain_Get(&RTEMS_Malloc_GC_list)) != NULL)
+    free(to_be_freed);
 
   /*
@@ -268 +294 @@
   MSBUMP(realloc_calls, 1);
 
+  /*
+   *  Do not attempt to allocate memory if in a critical section or ISR.
+   */
+
+  if (_Thread_Dispatch_disable_level > 0)
+    return (void *) 0;
+ 
+  if (_ISR_Nest_level > 0)
+    return (void *) 0;
+ 
+  /*
+   * Continue with calloc().
+   */
   if ( !ptr )
     return malloc( size );
@@ -314 +353 @@
     return;
 
+  /*
+   *  Do not attempt to free memory if in a critical section or ISR.
+   */
+
+  if ((_Thread_Dispatch_disable_level > 0) || (_ISR_Nest_level > 0)) {
+    Chain_Append(&RTEMS_Malloc_GC_list, (Chain_Node *)ptr);
+    return;
+  }
+ 
 #ifdef MALLOC_STATS
   {