[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd,commited] hurd _Fork: Drop duplicate malloc_fork_lock calls
From: |
Samuel Thibault |
Subject: |
[hurd,commited] hurd _Fork: Drop duplicate malloc_fork_lock calls |
Date: |
Sun, 11 Jul 2021 19:54:34 +0200 |
This was put in __libc_fork by c32c868ab8b2 ("posix: Add _Fork [BZ #4737]")
so we need to avoid locking them again in _Fork called by __libc_lock, otherwise
we deadlock.
---
sysdeps/mach/hurd/_Fork.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/sysdeps/mach/hurd/_Fork.c b/sysdeps/mach/hurd/_Fork.c
index df4ee05faa..75d45d6cad 100644
--- a/sysdeps/mach/hurd/_Fork.c
+++ b/sysdeps/mach/hurd/_Fork.c
@@ -119,7 +119,6 @@ retry:
handlers may use malloc, and the libio list lock has an
indirect malloc dependency as well (via the getdelim
function). */
- call_function_static_weak (__malloc_fork_lock_parent);
_hurd_malloc_fork_prepare ();
newtask = MACH_PORT_NULL;
@@ -588,7 +587,6 @@ retry:
/* Release malloc locks. */
_hurd_malloc_fork_parent ();
- call_function_static_weak (__malloc_fork_unlock_parent);
/* Run things that want to run in the parent to restore it to
normality. Usually prepare hooks and parent hooks are
@@ -662,7 +660,6 @@ retry:
/* Release malloc locks. */
_hurd_malloc_fork_child ();
- call_function_static_weak (__malloc_fork_unlock_child);
/* Run things that want to run in the child task to set up. */
RUN_HOOK (_hurd_fork_child_hook, ());
--
2.30.2
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [hurd,commited] hurd _Fork: Drop duplicate malloc_fork_lock calls,
Samuel Thibault <=
- Prev by Date:
[SCM] Hurd branch, master, updated. v0.9.git20210404-19-g967fc18
- Next by Date:
[hurd,commited] htl: Let libc call __pthread_mutex_{,try,un}lock
- Previous by thread:
[SCM] Hurd branch, master, updated. v0.9.git20210404-19-g967fc18
- Next by thread:
[hurd,commited] htl: Let libc call __pthread_mutex_{,try,un}lock
- Index(es):