Changeset 2125 for trunk

Timestamp:

Jul 1, 2005, 4:05:58 AM (20 years ago)

Author:

bird

Message:

fork trouble, the three heap handles might be duplicates of one another.

File:

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

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

@@ -135 +135 @@
             {
                 LIBCLOG_MSG("Locking the heaps.\n");
-                if (_um_tiled_heap)
-                    _um_heap_lock(_um_tiled_heap);
                 if (_um_high_heap)
                     _um_heap_lock(_um_high_heap);
-                if (_um_low_heap)
+                if (_um_low_heap && _um_low_heap != _um_high_heap)
                     _um_heap_lock(_um_low_heap);
+                if (_um_tiled_heap && _um_tiled_heap != _um_low_heap && _um_tiled_heap != _um_high_heap)
+                    _um_heap_lock(_um_tiled_heap);
             }
             break;
@@ -168 +168 @@
         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)
+            if (_um_low_heap && _um_low_heap != _um_high_heap)
                 _um_heap_unlock(_um_low_heap);
+            if (_um_tiled_heap && _um_tiled_heap != _um_low_heap && _um_tiled_heap != _um_high_heap)
+                _um_heap_unlock(_um_tiled_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)
+            if (_um_low_heap && _um_low_heap != _um_high_heap)
                 _fmutex_release_fork(&_um_low_heap->fsem);
+            if (_um_tiled_heap && _um_tiled_heap != _um_low_heap && _um_tiled_heap != _um_high_heap)
+                _fmutex_release_fork(&_um_tiled_heap->fsem);
         }
         gfForkCleanupDone = 1;