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/pt-raise.c | |
| parent | bbe35eb57144c081d10e76e35e52e9b400202b72 (diff) | |
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/pt-raise.c')
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/pt-raise.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/pt-raise.c b/nptl/sysdeps/unix/sysv/linux/pt-raise.c index 2efd7616bf..9161e29e28 100644 --- a/nptl/sysdeps/unix/sysv/linux/pt-raise.c +++ b/nptl/sysdeps/unix/sysv/linux/pt-raise.c @@ -28,13 +28,22 @@ int raise (sig) int sig; { +#if __ASSUME_TGKILL || defined __NR_tgkill + /* raise is an async-safe function. It could be called while the + fork function temporarily invalidated the PID field. Adjust for + that. */ + pid_t pid = THREAD_GETMEM (THREAD_SELF, pid); + if (__builtin_expect (pid < 0, 0)) + pid = -pid; +#endif + #if __ASSUME_TGKILL - return INLINE_SYSCALL (tgkill, 3, THREAD_GETMEM (THREAD_SELF, pid), - THREAD_GETMEM (THREAD_SELF, tid), sig); + return INLINE_SYSCALL (tgkill, 3, pid, THREAD_GETMEM (THREAD_SELF, tid), + sig); #else # ifdef __NR_tgkill - int res = INLINE_SYSCALL (tgkill, 3, THREAD_GETMEM (THREAD_SELF, pid), - THREAD_GETMEM (THREAD_SELF, tid), sig); + int res = INLINE_SYSCALL (tgkill, 3, pid, THREAD_GETMEM (THREAD_SELF, tid), + sig); if (res != -1 || errno != ENOSYS) return res; # endif |