diff options
| -rw-r--r-- | src/aio/aio.c | 14 | ||||
| -rw-r--r-- | src/internal/pthread_impl.h | 2 | ||||
| -rw-r--r-- | src/process/fork.c | 3 |
3 files changed, 19 insertions, 0 deletions
diff --git a/src/aio/aio.c b/src/aio/aio.c index 6d34fa86..f59679c3 100644 --- a/src/aio/aio.c +++ b/src/aio/aio.c @@ -392,6 +392,20 @@ int __aio_close(int fd) return fd; } +void __aio_atfork(int who) +{ + if (who<0) { + pthread_rwlock_rdlock(&maplock); + return; + } + if (who>0 && map) for (int a=0; a<(-1U/2+1)>>24; a++) + if (map[a]) for (int b=0; b<256; b++) + if (map[a][b]) for (int c=0; c<256; c++) + if (map[a][b][c]) for (int d=0; d<256; d++) + map[a][b][c][d] = 0; + pthread_rwlock_unlock(&maplock); +} + weak_alias(aio_cancel, aio_cancel64); weak_alias(aio_error, aio_error64); weak_alias(aio_fsync, aio_fsync64); diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h index 4d709bbc..358ad1ce 100644 --- a/src/internal/pthread_impl.h +++ b/src/internal/pthread_impl.h @@ -162,6 +162,8 @@ extern hidden void *__pthread_tsd_main[]; extern hidden volatile int __aio_fut; extern hidden volatile int __eintr_valid_flag; +extern hidden void __aio_atfork(int); + hidden int __clone(int (*)(void *), void *, int, void *, ...); hidden int __set_thread_area(void *); hidden int __libc_sigaction(int, const struct sigaction *, struct sigaction *); diff --git a/src/process/fork.c b/src/process/fork.c index 7e984ff8..dbaa9402 100644 --- a/src/process/fork.c +++ b/src/process/fork.c @@ -10,6 +10,7 @@ static void dummy(int x) } weak_alias(dummy, __fork_handler); +weak_alias(dummy, __aio_atfork); pid_t fork(void) { @@ -17,6 +18,7 @@ pid_t fork(void) sigset_t set; __fork_handler(-1); __block_all_sigs(&set); + __aio_atfork(-1); #ifdef SYS_fork ret = __syscall(SYS_fork); #else @@ -32,6 +34,7 @@ pid_t fork(void) libc.threads_minus_1 = 0; if (libc.need_locks) libc.need_locks = -1; } + __aio_atfork(!ret); __restore_sigs(&set); __fork_handler(!ret); return __syscall_ret(ret); |