Changeset c11ca814 in rtems

Timestamp:

Nov 26, 2003, 5:51:00 PM (16 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Children:

294daf49

Parents:

86042ae

Message:

2003-11-26 Joel Sherrill <joel@…>

PR 523/filesystem

• src/malloc.c: Make malloc family safer for use from ISRs and dispatching critical sections. If in a critical section while doing a free(), then the free is deferred until the next malloc() attempt.

Location:

cpukit/libcsupport

Files:

• ChangeLog (modified) (1 diff)
• src/malloc.c (modified) (3 diffs)

cpukit/libcsupport/ChangeLog

@@ +1 @@
+2003-11-26      Joel Sherrill <joel@OARcorp.com>
+
+        PR 523/filesystem
+        * src/malloc.c: Make malloc family safer for use from ISRs and
+        dispatching critical sections. If in a critical section while doing
+        a free(), then the free is deferred until the next malloc() attempt.
+
 2003-11-25      Jennifer Averett <jennifer@OARcorp.com>
 

cpukit/libcsupport/src/malloc.c

@@ -171 +171 @@
    */
 
-  if (_Thread_Dispatch_disable_level > 0)
-    return (void *) 0;
- 
-  if (_ISR_Nest_level > 0)
-    return (void *) 0;
+  if (_System_state_Is_up(_System_state_Get())) {
+    if (_Thread_Dispatch_disable_level > 0)
+      return (void *) 0;
+ 
+    if (_ISR_Nest_level > 0)
+      return (void *) 0;
+  }
  
   /*
@@ -298 +300 @@
    */
 
-  if (_Thread_Dispatch_disable_level > 0)
-    return (void *) 0;
- 
-  if (_ISR_Nest_level > 0)
-    return (void *) 0;
+  if (_System_state_Is_up(_System_state_Get())) {
+    if (_Thread_Dispatch_disable_level > 0)
+      return (void *) 0;
+ 
+    if (_ISR_Nest_level > 0)
+      return (void *) 0;
+  }
  
   /*
@@ -357 +361 @@
    */
 
-  if ((_Thread_Dispatch_disable_level > 0) || (_ISR_Nest_level > 0)) {
-    Chain_Append(&RTEMS_Malloc_GC_list, (Chain_Node *)ptr);
-    return;
+  if (_System_state_Is_up(_System_state_Get())) {
+    if ((_Thread_Dispatch_disable_level > 0) || (_ISR_Nest_level > 0)) {
+      Chain_Append(&RTEMS_Malloc_GC_list, (Chain_Node *)ptr);
+      return;
+    }
   }