From c757a64fc087e9a4b4a3f465d8d9a732ac208032 Mon Sep 17 00:00:00 2001 From: Kevin Cernekee Date: Sun, 8 Apr 2012 11:43:02 -0700 Subject: signalfd.h: Use new "bits/" scheme for arch-specific flags glibc has split off the arch-specific flag definitions (like SFD_NONBLOCK) into /bits/signalfd.h, so that there are no longer multiple redundant copies of the entire header file. We will adopt the same scheme in uClibc. Special cases are included for: alpha mips sparc hppa was omitted because it has not been updated in glibc. All others use the common definition. Signed-off-by: Kevin Cernekee Signed-off-by: Mike Frysinger --- Makefile.in | 1 + include/.gitignore | 1 + include/sys/signalfd.h | 95 ------------------------------- libc/sysdeps/linux/alpha/bits/signalfd.h | 29 ++++++++++ libc/sysdeps/linux/common/bits/signalfd.h | 29 ++++++++++ libc/sysdeps/linux/common/sys/signalfd.h | 58 +++++++++++++++++++ libc/sysdeps/linux/mips/bits/signalfd.h | 29 ++++++++++ libc/sysdeps/linux/sparc/bits/signalfd.h | 29 ++++++++++ 8 files changed, 176 insertions(+), 95 deletions(-) delete mode 100644 include/sys/signalfd.h create mode 100644 libc/sysdeps/linux/alpha/bits/signalfd.h create mode 100644 libc/sysdeps/linux/common/bits/signalfd.h create mode 100644 libc/sysdeps/linux/common/sys/signalfd.h create mode 100644 libc/sysdeps/linux/mips/bits/signalfd.h create mode 100644 libc/sysdeps/linux/sparc/bits/signalfd.h diff --git a/Makefile.in b/Makefile.in index be56a1984..fb118c0b9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -279,6 +279,7 @@ HEADERS_RM-$(UCLIBC_LINUX_SPECIFIC) += sys/eventfd.h sys/fsuid.h \ sys/prctl.h \ sys/reboot.h \ sys/sendfile.h \ + bits/signalfd.h \ sys/signalfd.h \ bits/statfs.h \ sys/statfs.h \ diff --git a/include/.gitignore b/include/.gitignore index 2d096d113..34589e359 100644 --- a/include/.gitignore +++ b/include/.gitignore @@ -36,6 +36,7 @@ /sys/ptrace.h /sys/reg.h /sys/regdef.h +/sys/signalfd.h /sys/sysmips.h /sys/tas.h /sys/timerfd.h diff --git a/include/sys/signalfd.h b/include/sys/signalfd.h deleted file mode 100644 index f1cb63a5c..000000000 --- a/include/sys/signalfd.h +++ /dev/null @@ -1,95 +0,0 @@ -/* Copyright (C) 2007, 2008 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -#ifndef _SYS_SIGNALFD_H -#define _SYS_SIGNALFD_H 1 - -#define __need_sigset_t -#include -#include - - -struct signalfd_siginfo -{ - uint32_t ssi_signo; - int32_t ssi_errno; - int32_t ssi_code; - uint32_t ssi_pid; - uint32_t ssi_uid; - int32_t ssi_fd; - uint32_t ssi_tid; - uint32_t ssi_band; - uint32_t ssi_overrun; - uint32_t ssi_trapno; - int32_t ssi_status; - int32_t ssi_int; - uint64_t ssi_ptr; - uint64_t ssi_utime; - uint64_t ssi_stime; - uint64_t ssi_addr; - uint8_t __pad[48]; -}; - -/* Flags for signalfd. */ -#if defined __sparc__ || defined __sparc64__ -enum - { - SFD_CLOEXEC = 0x400000, -# define SFD_CLOEXEC SFD_CLOEXEC - SFD_NONBLOCK = 0x4000 -# define SFD_NONBLOCK SFD_NONBLOCK - }; - -#elif defined __alpha__ -enum - { - SFD_CLOEXEC = 010000000, -# define SFD_CLOEXEC SFD_CLOEXEC - SFD_NONBLOCK = 04 -# define SFD_NONBLOCK SFD_NONBLOCK - }; - -#elif defined __mips__ -enum - { - SFD_CLOEXEC = 02000000, -# define SFD_CLOEXEC SFD_CLOEXEC - SFD_NONBLOCK = 0200 -# define SFD_NONBLOCK SFD_NONBLOCK - }; - -#else -enum - { - SFD_CLOEXEC = 02000000, -# define SFD_CLOEXEC SFD_CLOEXEC - SFD_NONBLOCK = 04000 -# define SFD_NONBLOCK SFD_NONBLOCK - }; -#endif - -__BEGIN_DECLS - -/* Request notification for delivery of signals in MASK to be - performed using descriptor FD.*/ -extern int signalfd (int __fd, const sigset_t *__mask, int __flags) - __nonnull ((2)) __THROW; - -__END_DECLS - -#endif /* sys/signalfd.h */ diff --git a/libc/sysdeps/linux/alpha/bits/signalfd.h b/libc/sysdeps/linux/alpha/bits/signalfd.h new file mode 100644 index 000000000..7ea70faef --- /dev/null +++ b/libc/sysdeps/linux/alpha/bits/signalfd.h @@ -0,0 +1,29 @@ +/* Copyright (C) 2007-2012 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _SYS_SIGNALFD_H +# error "Never use directly; include instead." +#endif + +/* Flags for signalfd. */ +enum + { + SFD_CLOEXEC = 010000000, +#define SFD_CLOEXEC SFD_CLOEXEC + SFD_NONBLOCK = 000000004 +#define SFD_NONBLOCK SFD_NONBLOCK + }; diff --git a/libc/sysdeps/linux/common/bits/signalfd.h b/libc/sysdeps/linux/common/bits/signalfd.h new file mode 100644 index 000000000..f2c0dde2f --- /dev/null +++ b/libc/sysdeps/linux/common/bits/signalfd.h @@ -0,0 +1,29 @@ +/* Copyright (C) 2007-2012 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _SYS_SIGNALFD_H +# error "Never use directly; include instead." +#endif + +/* Flags for signalfd. */ +enum + { + SFD_CLOEXEC = 02000000, +#define SFD_CLOEXEC SFD_CLOEXEC + SFD_NONBLOCK = 00004000 +#define SFD_NONBLOCK SFD_NONBLOCK + }; diff --git a/libc/sysdeps/linux/common/sys/signalfd.h b/libc/sysdeps/linux/common/sys/signalfd.h new file mode 100644 index 000000000..46a8d479f --- /dev/null +++ b/libc/sysdeps/linux/common/sys/signalfd.h @@ -0,0 +1,58 @@ +/* Copyright (C) 2007-2012 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _SYS_SIGNALFD_H +#define _SYS_SIGNALFD_H 1 + +#define __need_sigset_t +#include +#include + +/* Get the platform-dependent flags. */ +#include + +struct signalfd_siginfo +{ + uint32_t ssi_signo; + int32_t ssi_errno; + int32_t ssi_code; + uint32_t ssi_pid; + uint32_t ssi_uid; + int32_t ssi_fd; + uint32_t ssi_tid; + uint32_t ssi_band; + uint32_t ssi_overrun; + uint32_t ssi_trapno; + int32_t ssi_status; + int32_t ssi_int; + uint64_t ssi_ptr; + uint64_t ssi_utime; + uint64_t ssi_stime; + uint64_t ssi_addr; + uint8_t __pad[48]; +}; + +__BEGIN_DECLS + +/* Request notification for delivery of signals in MASK to be + performed using descriptor FD.*/ +extern int signalfd (int __fd, const sigset_t *__mask, int __flags) + __THROW __nonnull ((2)); + +__END_DECLS + +#endif /* sys/signalfd.h */ diff --git a/libc/sysdeps/linux/mips/bits/signalfd.h b/libc/sysdeps/linux/mips/bits/signalfd.h new file mode 100644 index 000000000..c2bea7605 --- /dev/null +++ b/libc/sysdeps/linux/mips/bits/signalfd.h @@ -0,0 +1,29 @@ +/* Copyright (C) 2007-2012 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _SYS_SIGNALFD_H +# error "Never use directly; include instead." +#endif + +/* Flags for signalfd. */ +enum + { + SFD_CLOEXEC = 02000000, +#define SFD_CLOEXEC SFD_CLOEXEC + SFD_NONBLOCK = 00000200 +#define SFD_NONBLOCK SFD_NONBLOCK + }; diff --git a/libc/sysdeps/linux/sparc/bits/signalfd.h b/libc/sysdeps/linux/sparc/bits/signalfd.h new file mode 100644 index 000000000..1271e3409 --- /dev/null +++ b/libc/sysdeps/linux/sparc/bits/signalfd.h @@ -0,0 +1,29 @@ +/* Copyright (C) 2007-2012 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _SYS_SIGNALFD_H +# error "Never use directly; include instead." +#endif + +/* Flags for signalfd. */ +enum + { + SFD_CLOEXEC = 0x400000, +#define SFD_CLOEXEC SFD_CLOEXEC + SFD_NONBLOCK = 0x004000 +#define SFD_NONBLOCK SFD_NONBLOCK + }; -- cgit v1.2.3