diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-12-20 23:39:42 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-12-20 23:39:42 +0000 |
| commit | c0ecb80a43103964d30d8629ce45098fca307081 (patch) | |
| tree | 859db25ae2d571c91dabf49a70c8c2e1da535ebe /nptl/sysdeps/unix/sysv/linux/raise.c | |
| parent | bbe35eb57144c081d10e76e35e52e9b400202b72 (diff) | |
| download | glibc-c0ecb80a43103964d30d8629ce45098fca307081.tar.gz glibc-c0ecb80a43103964d30d8629ce45098fca307081.tar.xz glibc-c0ecb80a43103964d30d8629ce45098fca307081.zip | |
Update.
2003-12-20 Ulrich Drepper <drepper@redhat.com> * elf/rtld.c (dl_main): Optimize order or subexpressions in if().
Diffstat (limited to 'nptl/sysdeps/unix/sysv/linux/raise.c')
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/raise.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/raise.c b/nptl/sysdeps/unix/sysv/linux/raise.c index 25d3ed8afd..268ba87b29 100644 --- a/nptl/sysdeps/unix/sysv/linux/raise.c +++ b/nptl/sysdeps/unix/sysv/linux/raise.c @@ -29,6 +29,9 @@ raise (sig) int sig; { struct pthread *pd = THREAD_SELF; +#if __ASSUME_TGKILL || defined __NR_tgkill + pid_t pid = THREAD_GETMEM (pd, pid); +#endif pid_t selftid = THREAD_GETMEM (pd, tid); if (selftid == 0) { @@ -41,15 +44,24 @@ raise (sig) #endif THREAD_SETMEM (pd, tid, selftid); - /* In this case the TID and PID are the same. */ - THREAD_SETMEM (pd, pid, selftid); + /* We do not set the PID field in the TID here since we might be + called from a signal handler while the thread executes fork. */ + pid = selftid; } +#if __ASSUME_TGKILL || defined __NR_tgkill + else + /* raise is an async-safe function. It could be called while the + fork function temporarily invalidated the PID field. Adjust for + that. */ + if (__builtin_expect (pid < 0, 0)) + pid = -pid; +#endif #if __ASSUME_TGKILL - return INLINE_SYSCALL (tgkill, 3, THREAD_GETMEM (pd, pid), selftid, sig); + return INLINE_SYSCALL (tgkill, 3, pid, selftid, sig); #else # ifdef __NR_tgkill - int res = INLINE_SYSCALL (tgkill, 3, THREAD_GETMEM (pd, pid), selftid, sig); + int res = INLINE_SYSCALL (tgkill, 3, pid, selftid, sig); if (res != -1 || errno != ENOSYS) return res; # endif |