Changeset 1809

Timestamp:

Feb 17, 2005, 10:40:05 PM (20 years ago)

Author:

bird

Message:

Applied fix for fork() heap trouble from Lorne.

File:

• trunk/src/emx/src/lib/malloc/initr.c (modified) (1 diff, 1 prop)

trunk/src/emx/src/lib/malloc/initr.c ¶

@@ -166 +166 @@
     {
         LIBCLOG_MSG("Unlocking the heaps.\n");
-        if (_um_tiled_heap)
-            _fmutex_release_fork(&_um_tiled_heap->fsem);
-        if (_um_high_heap)
-            _fmutex_release_fork(&_um_high_heap->fsem);
-        if (_um_low_heap)
-            _fmutex_release_fork(&_um_low_heap->fsem);
+        if (enmCtx == __LIBC_FORK_CTX_PARENT)
+        {
+            if (_um_tiled_heap)
+                _um_heap_unlock(_um_tiled_heap);
+            if (_um_high_heap)
+                _um_heap_unlock(_um_high_heap);
+            if (_um_low_heap)
+                _um_heap_unlock(_um_low_heap);
+        }
+        else
+        {
+            if (_um_tiled_heap)
+                _fmutex_release_fork(&_um_tiled_heap->fsem);
+            if (_um_high_heap)
+                _fmutex_release_fork(&_um_high_heap->fsem);
+            if (_um_low_heap)
+                _fmutex_release_fork(&_um_low_heap->fsem);
+        }
         gfForkCleanupDone = 1;
     }