Changeset c11ca814 in rtems
- Timestamp:
- 11/26/03 17:51:00 (19 years ago)
- Children:
- 294daf49
- Parents:
- 86042ae9
- Location:
- cpukit/libcsupport
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
cpukit/libcsupport/ChangeLog
r86042ae9 rc11ca814 1 2003-11-26 Joel Sherrill <joel@OARcorp.com> 2 3 PR 523/filesystem 4 * src/malloc.c: Make malloc family safer for use from ISRs and 5 dispatching critical sections. If in a critical section while doing 6 a free(), then the free is deferred until the next malloc() attempt. 7 1 8 2003-11-25 Jennifer Averett <jennifer@OARcorp.com> 2 9 -
cpukit/libcsupport/src/malloc.c
r86042ae9 rc11ca814 171 171 */ 172 172 173 if (_Thread_Dispatch_disable_level > 0) 174 return (void *) 0; 175 176 if (_ISR_Nest_level > 0) 177 return (void *) 0; 173 if (_System_state_Is_up(_System_state_Get())) { 174 if (_Thread_Dispatch_disable_level > 0) 175 return (void *) 0; 176 177 if (_ISR_Nest_level > 0) 178 return (void *) 0; 179 } 178 180 179 181 /* … … 298 300 */ 299 301 300 if (_Thread_Dispatch_disable_level > 0) 301 return (void *) 0; 302 303 if (_ISR_Nest_level > 0) 304 return (void *) 0; 302 if (_System_state_Is_up(_System_state_Get())) { 303 if (_Thread_Dispatch_disable_level > 0) 304 return (void *) 0; 305 306 if (_ISR_Nest_level > 0) 307 return (void *) 0; 308 } 305 309 306 310 /* … … 357 361 */ 358 362 359 if ((_Thread_Dispatch_disable_level > 0) || (_ISR_Nest_level > 0)) { 360 Chain_Append(&RTEMS_Malloc_GC_list, (Chain_Node *)ptr); 361 return; 363 if (_System_state_Is_up(_System_state_Get())) { 364 if ((_Thread_Dispatch_disable_level > 0) || (_ISR_Nest_level > 0)) { 365 Chain_Append(&RTEMS_Malloc_GC_list, (Chain_Node *)ptr); 366 return; 367 } 362 368 } 363 369
Note: See TracChangeset
for help on using the changeset viewer.