qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

1999-06-02  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/i386/sigaction.c: Read kernel-features.h
	and elide compatibility code if possible.
This commit is contained in:
Ulrich Drepper 1999-06-02 10:30:16 +00:00
parent 13632cfc66
commit ea6710d38f
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
1999-06-02 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/i386/sigaction.c: Read kernel-features.h
and elide compatibility code if possible.
1999-06-01 Ulrich Drepper <drepper@cygnus.com> 1999-06-01 Ulrich Drepper <drepper@cygnus.com>
* manual/llio.texi: Remove menu entry for removed section. * manual/llio.texi: Remove menu entry for removed section.

19
sysdeps/unix/sysv/linux/i386/sigaction.c
View File

@ -1,5 +1,5 @@
/* POSIX.1 `sigaction' call for Linux/i386. /* POSIX.1 `sigaction' call for Linux/i386.
Copyright (C) 1991, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. Copyright (C) 1991, 95, 96, 97, 98, 99 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -25,6 +25,8 @@
#include <sysdep.h> #include <sysdep.h>
#include <sys/syscall.h> #include <sys/syscall.h>
#include <kernel-features.h>
/* The difference here is that the sigaction structure used in the /* The difference here is that the sigaction structure used in the
kernel is not the same as we use in the libc. Therefore we must kernel is not the same as we use in the libc. Therefore we must
translate it here. */ translate it here. */
@ -34,9 +36,11 @@
extern int __syscall_rt_sigaction (int, const struct kernel_sigaction *, extern int __syscall_rt_sigaction (int, const struct kernel_sigaction *,
struct kernel_sigaction *, size_t); struct kernel_sigaction *, size_t);
#if __ASSUME_REALTIME_SIGNALS == 0
/* The variable is shared between all wrappers around signal handling /* The variable is shared between all wrappers around signal handling
functions which have RT equivalents. */ functions which have RT equivalents. */
int __libc_missing_rt_sigs; int __libc_missing_rt_sigs;
#endif
/* If ACT is not NULL, change the action for SIG to *ACT. /* If ACT is not NULL, change the action for SIG to *ACT.
@ -44,15 +48,22 @@ int __libc_missing_rt_sigs;
int int
__sigaction (int sig, const struct sigaction *act, struct sigaction *oact) __sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
{ {
#if __ASSUME_REALTIME_SIGNALS == 0
struct old_kernel_sigaction k_newact, k_oldact; struct old_kernel_sigaction k_newact, k_oldact;
#endif
int result; int result;
#ifdef __NR_rt_sigaction #ifdef __NR_rt_sigaction
/* First try the RT signals. */ /* First try the RT signals. */
# if __ASSUME_REALTIME_SIGNALS == 0
if (!__libc_missing_rt_sigs) if (!__libc_missing_rt_sigs)
# endif
{ {
struct kernel_sigaction kact, koact; struct kernel_sigaction kact, koact;
# if __ASSUME_REALTIME_SIGNALS == 0
int saved_errno = errno; int saved_errno = errno;
# endif
if (act) if (act)
{ {
@ -69,7 +80,9 @@ __sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
result = INLINE_SYSCALL (rt_sigaction, 4, sig, act ? &kact : NULL, result = INLINE_SYSCALL (rt_sigaction, 4, sig, act ? &kact : NULL,
oact ? &koact : NULL, _NSIG / 8); oact ? &koact : NULL, _NSIG / 8);
# if __ASSUME_REALTIME_SIGNALS == 0
if (result >= 0 || errno != ENOSYS) if (result >= 0 || errno != ENOSYS)
# endif
{ {
if (oact && result >= 0) if (oact && result >= 0)
{ {
@ -81,11 +94,14 @@ __sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
return result; return result;
} }
# if __ASSUME_REALTIME_SIGNALS == 0
__set_errno (saved_errno); __set_errno (saved_errno);
__libc_missing_rt_sigs = 1; __libc_missing_rt_sigs = 1;
# endif
} }
#endif #endif
#if __ASSUME_REALTIME_SIGNALS == 0
if (act) if (act)
{ {
k_newact.k_sa_handler = act->sa_handler; k_newact.k_sa_handler = act->sa_handler;
@ -119,6 +135,7 @@ __sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
} }
return 0; return 0;
#endif
restore: restore:
asm ( asm (