diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-09-22 01:48:31 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-09-22 01:48:31 +0200 |
| commit | 1814ae86b44eb9002d740bb5093534c253dc3655 (patch) | |
| tree | fb282cb384b67b1bc975a8d8c02c626937fa1480 /hurd | |
| parent | a392ecc206b9da5a33297d78d6b1c25a555e49e4 (diff) | |
| parent | a58ce85fb64ec8a7a3684fb0a56a30a1c67b2d11 (diff) | |
Merge branch 'cvs/mallocfork' into refs/top-bases/tschwinge/Roger_Whittaker
Diffstat (limited to 'hurd')
| -rw-r--r-- | hurd/hurdmalloc.c | 15 | ||||
| -rw-r--r-- | hurd/hurdmalloc.h | 4 |
2 files changed, 10 insertions, 9 deletions
diff --git a/hurd/hurdmalloc.c b/hurd/hurdmalloc.c index 071abeb718..2b5ad6e129 100644 --- a/hurd/hurdmalloc.c +++ b/hurd/hurdmalloc.c @@ -409,8 +409,8 @@ print_malloc_free_list (void) } #endif /* DEBUG */ -static void -malloc_fork_prepare(void) +void +_hurd_malloc_fork_prepare(void) /* * Prepare the malloc module for a fork by insuring that no thread is in a * malloc critical section. @@ -423,8 +423,8 @@ malloc_fork_prepare(void) } } -static void -malloc_fork_parent(void) +void +_hurd_malloc_fork_parent(void) /* * Called in the parent process after a fork() to resume normal operation. */ @@ -436,8 +436,8 @@ malloc_fork_parent(void) } } -static void -malloc_fork_child(void) +void +_hurd_malloc_fork_child(void) /* * Called in the child process after a fork() to resume normal operation. */ @@ -450,7 +450,4 @@ malloc_fork_child(void) } -text_set_element (_hurd_fork_prepare_hook, malloc_fork_prepare); -text_set_element (_hurd_fork_parent_hook, malloc_fork_parent); -text_set_element (_hurd_fork_child_hook, malloc_fork_child); text_set_element (_hurd_preinit_hook, malloc_init); diff --git a/hurd/hurdmalloc.h b/hurd/hurdmalloc.h index e11c208a8f..ab572e2814 100644 --- a/hurd/hurdmalloc.h +++ b/hurd/hurdmalloc.h @@ -12,6 +12,10 @@ extern void *_hurd_malloc (size_t); extern void *_hurd_realloc (void *, size_t); extern void _hurd_free (void *); +extern void _hurd_malloc_fork_prepare(void); +extern void _hurd_malloc_fork_parent(void); +extern void _hurd_malloc_fork_child(void); + #define malloc _hurd_malloc #define realloc _hurd_realloc #define free _hurd_free |