generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 1f29c2f5: Merge "Switch sigpending over to rt_sigpending."

Browse Source 
* commit '1f29c2f51097b68110bc2766a7c1560d6a8831d0':
  Switch sigpending over to rt_sigpending.
This commit is contained in:
Elliott Hughes
2013-10-16 14:13:10 -07:00
committed by Android Git Automerger
parent 2426cdb63b 1f29c2f510
commit d6e117b64b
13 changed files with 140 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libc/Android.mk
View File

@@ -246,6 +246,7 @@ libc_bionic_src_files := \
bionic/seteuid.cpp \
bionic/setlocale.cpp \
bionic/signalfd.cpp \
bionic/sigpending.cpp \
bionic/sigprocmask.cpp \
bionic/sigsuspend.cpp \
bionic/sigwait.cpp \

9
libc/SYSCALLS.TXT
View File

@@ -28,13 +28,12 @@
void _exit:exit_group(int) all
void _exit_thread:exit(int) all
pid_t __fork:fork(void) all
pid_t _waitpid:waitpid(pid_t, int*, int, struct rusage*) mips,x86
int __waitid:waitid(int, pid_t, struct siginfo_t*, int, void*) all
pid_t wait4(pid_t pid, int* status, int options, struct rusage* rusage) all
# NOTE: this system call is never called directly, but we list it there
# to have __NR_clone properly defined.
# NOTE: these stubs are unused.
pid_t __sys_clone:clone(int, void*, int*, void*, int*) all
pid_t _waitpid:waitpid(pid_t, int*, int, struct rusage*) mips,x86
int __waitid:waitid(int, pid_t, struct siginfo_t*, int, void*) all
int execve(const char*, char* const*, char* const*) all
@@ -226,8 +225,8 @@ int timerfd_gettime(int, struct itimerspec*) all
# signals
int sigaction(int, const struct sigaction*, struct sigaction*) arm,x86,mips
int sigpending(sigset_t*) arm,x86,mips
int __rt_sigaction:rt_sigaction(int, const struct sigaction*, struct sigaction*, size_t) all
int __rt_sigpending:rt_sigpending(sigset_t*, size_t) all
int __rt_sigprocmask:rt_sigprocmask(int, const sigset_t*, sigset_t*, size_t) all
int __rt_sigsuspend:rt_sigsuspend(const sigset_t*, size_t) all
int __rt_sigtimedwait:rt_sigtimedwait(const sigset_t*, struct siginfo_t*, struct timespec_t*, size_t) all

4
libc/arch-arm/syscalls.mk
View File

@@ -3,9 +3,9 @@ syscall_src :=
syscall_src += arch-arm/syscalls/_exit.S
syscall_src += arch-arm/syscalls/_exit_thread.S
syscall_src += arch-arm/syscalls/__fork.S
syscall_src += arch-arm/syscalls/__waitid.S
syscall_src += arch-arm/syscalls/wait4.S
syscall_src += arch-arm/syscalls/__sys_clone.S
syscall_src += arch-arm/syscalls/__waitid.S
syscall_src += arch-arm/syscalls/execve.S
syscall_src += arch-arm/syscalls/getuid.S
syscall_src += arch-arm/syscalls/getgid.S
@@ -152,8 +152,8 @@ syscall_src += arch-arm/syscalls/timerfd_create.S
syscall_src += arch-arm/syscalls/timerfd_settime.S
syscall_src += arch-arm/syscalls/timerfd_gettime.S
syscall_src += arch-arm/syscalls/sigaction.S
syscall_src += arch-arm/syscalls/sigpending.S
syscall_src += arch-arm/syscalls/__rt_sigaction.S
syscall_src += arch-arm/syscalls/__rt_sigpending.S
syscall_src += arch-arm/syscalls/__rt_sigprocmask.S
syscall_src += arch-arm/syscalls/__rt_sigsuspend.S
syscall_src += arch-arm/syscalls/__rt_sigtimedwait.S

6
libc/arch-arm/syscalls/sigpending.S → libc/arch-arm/syscalls/__rt_sigpending.S
View File

@@ -3,13 +3,13 @@
#include <linux/err.h>
#include <machine/asm.h>
ENTRY(sigpending)
ENTRY(__rt_sigpending)
mov ip, r7
ldr r7, =__NR_sigpending
ldr r7, =__NR_rt_sigpending
swi #0
mov r7, ip
cmn r0, #(MAX_ERRNO + 1)
bxls lr
neg r0, r0
b __set_errno
END(sigpending)
END(__rt_sigpending)

6
libc/arch-mips/syscalls.mk
View File

@@ -3,10 +3,10 @@ syscall_src :=
syscall_src += arch-mips/syscalls/_exit.S
syscall_src += arch-mips/syscalls/_exit_thread.S
syscall_src += arch-mips/syscalls/__fork.S
syscall_src += arch-mips/syscalls/_waitpid.S
syscall_src += arch-mips/syscalls/__waitid.S
syscall_src += arch-mips/syscalls/wait4.S
syscall_src += arch-mips/syscalls/__sys_clone.S
syscall_src += arch-mips/syscalls/_waitpid.S
syscall_src += arch-mips/syscalls/__waitid.S
syscall_src += arch-mips/syscalls/execve.S
syscall_src += arch-mips/syscalls/getuid.S
syscall_src += arch-mips/syscalls/getgid.S
@@ -155,8 +155,8 @@ syscall_src += arch-mips/syscalls/timerfd_create.S
syscall_src += arch-mips/syscalls/timerfd_settime.S
syscall_src += arch-mips/syscalls/timerfd_gettime.S
syscall_src += arch-mips/syscalls/sigaction.S
syscall_src += arch-mips/syscalls/sigpending.S
syscall_src += arch-mips/syscalls/__rt_sigaction.S
syscall_src += arch-mips/syscalls/__rt_sigpending.S
syscall_src += arch-mips/syscalls/__rt_sigprocmask.S
syscall_src += arch-mips/syscalls/__rt_sigsuspend.S
syscall_src += arch-mips/syscalls/__rt_sigtimedwait.S

10
libc/arch-mips/syscalls/sigpending.S → libc/arch-mips/syscalls/__rt_sigpending.S
View File

@@ -1,14 +1,14 @@
/* autogenerated by gensyscalls.py */
#include <asm/unistd.h>
.text
.globl sigpending
.globl __rt_sigpending
.align 4
.ent sigpending
.ent __rt_sigpending
sigpending:
__rt_sigpending:
.set noreorder
.cpload $t9
li $v0, __NR_sigpending
li $v0, __NR_rt_sigpending
syscall
bnez $a3, 1f
move $a0, $v0
@@ -19,4 +19,4 @@ sigpending:
j $t9
nop
.set reorder
.end sigpending
.end __rt_sigpending

6
libc/arch-x86/syscalls.mk
View File

@@ -3,10 +3,10 @@ syscall_src :=
syscall_src += arch-x86/syscalls/_exit.S
syscall_src += arch-x86/syscalls/_exit_thread.S
syscall_src += arch-x86/syscalls/__fork.S
syscall_src += arch-x86/syscalls/_waitpid.S
syscall_src += arch-x86/syscalls/__waitid.S
syscall_src += arch-x86/syscalls/wait4.S
syscall_src += arch-x86/syscalls/__sys_clone.S
syscall_src += arch-x86/syscalls/_waitpid.S
syscall_src += arch-x86/syscalls/__waitid.S
syscall_src += arch-x86/syscalls/execve.S
syscall_src += arch-x86/syscalls/getuid.S
syscall_src += arch-x86/syscalls/getgid.S
@@ -156,8 +156,8 @@ syscall_src += arch-x86/syscalls/timerfd_create.S
syscall_src += arch-x86/syscalls/timerfd_settime.S
syscall_src += arch-x86/syscalls/timerfd_gettime.S
syscall_src += arch-x86/syscalls/sigaction.S
syscall_src += arch-x86/syscalls/sigpending.S
syscall_src += arch-x86/syscalls/__rt_sigaction.S
syscall_src += arch-x86/syscalls/__rt_sigpending.S
syscall_src += arch-x86/syscalls/__rt_sigprocmask.S
syscall_src += arch-x86/syscalls/__rt_sigsuspend.S
syscall_src += arch-x86/syscalls/__rt_sigtimedwait.S

11
libc/arch-x86/syscalls/sigpending.S → libc/arch-x86/syscalls/__rt_sigpending.S
View File

@@ -3,10 +3,12 @@
#include <linux/err.h>
#include <machine/asm.h>
ENTRY(sigpending)
ENTRY(__rt_sigpending)
pushl %ebx
mov 8(%esp), %ebx
movl $__NR_sigpending, %eax
pushl %ecx
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_rt_sigpending, %eax
int $0x80
cmpl $-MAX_ERRNO, %eax
jb 1f
@@ -16,6 +18,7 @@ ENTRY(sigpending)
addl $4, %esp
orl $-1, %eax
1:
popl %ecx
popl %ebx
ret
END(sigpending)
END(__rt_sigpending)

3
libc/arch-x86_64/syscalls.mk
View File

@@ -3,9 +3,9 @@ syscall_src :=
syscall_src += arch-x86_64/syscalls/_exit.S
syscall_src += arch-x86_64/syscalls/_exit_thread.S
syscall_src += arch-x86_64/syscalls/__fork.S
syscall_src += arch-x86_64/syscalls/__waitid.S
syscall_src += arch-x86_64/syscalls/wait4.S
syscall_src += arch-x86_64/syscalls/__sys_clone.S
syscall_src += arch-x86_64/syscalls/__waitid.S
syscall_src += arch-x86_64/syscalls/execve.S
syscall_src += arch-x86_64/syscalls/getuid.S
syscall_src += arch-x86_64/syscalls/getgid.S
@@ -150,6 +150,7 @@ syscall_src += arch-x86_64/syscalls/timerfd_create.S
syscall_src += arch-x86_64/syscalls/timerfd_settime.S
syscall_src += arch-x86_64/syscalls/timerfd_gettime.S
syscall_src += arch-x86_64/syscalls/__rt_sigaction.S
syscall_src += arch-x86_64/syscalls/__rt_sigpending.S
syscall_src += arch-x86_64/syscalls/__rt_sigprocmask.S
syscall_src += arch-x86_64/syscalls/__rt_sigsuspend.S
syscall_src += arch-x86_64/syscalls/__rt_sigtimedwait.S

17
libc/arch-x86_64/syscalls/__rt_sigpending.S Normal file
View File

@@ -0,0 +1,17 @@
/* autogenerated by gensyscalls.py */
#include <asm/unistd.h>
#include <linux/err.h>
#include <machine/asm.h>
ENTRY(__rt_sigpending)
movl $__NR_rt_sigpending, %eax
syscall
cmpq $-MAX_ERRNO, %rax
jb 1f
negl %eax
movl %eax, %edi
call __set_errno
orq $-1, %rax
1:
ret
END(__rt_sigpending)

42
libc/bionic/sigpending.cpp Normal file
View File

@@ -0,0 +1,42 @@
/*
* Copyright (C) 2013 The Android Open Source Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include <signal.h>
#include "private/kernel_sigset_t.h"
extern "C" int __rt_sigpending(const kernel_sigset_t*, size_t);
int sigpending(sigset_t* bionic_set) {
kernel_sigset_t set;
int result = __rt_sigpending(&set, sizeof(set));
if (result != -1) {
*bionic_set = set.bionic;
}
return result;
}

24
libc/include/signal.h
View File

@@ -122,24 +122,20 @@ static __inline__ __sighandler_t signal(int s, __sighandler_t f)
return bsd_signal(s,f);
}
/* the syscall itself */
extern __sighandler_t __signal(int, __sighandler_t, int);
extern int sigprocmask(int, const sigset_t *, sigset_t *);
extern int sigaction(int, const struct sigaction *, struct sigaction *);
extern int sigpending(sigset_t *);
extern int sigsuspend(const sigset_t *);
extern int sigwait(const sigset_t *set, int *sig);
extern int siginterrupt(int sig, int flag);
extern int sigaction(int, const struct sigaction*, struct sigaction*);
extern int siginterrupt(int, int);
extern int sigpending(sigset_t*) __nonnull((1));
extern int sigprocmask(int, const sigset_t*, sigset_t*);
extern int sigsuspend(const sigset_t*) __nonnull((1));
extern int sigwait(const sigset_t*, int*) __nonnull((1, 2));
extern int raise(int);
extern int kill(pid_t, int);
extern int killpg(int pgrp, int sig);
extern int sigaltstack(const stack_t *ss, stack_t *oss);
extern int killpg(int, int);
extern int sigaltstack(const stack_t*, stack_t*);
extern void psiginfo(const siginfo_t* si, const char* message);
extern void psignal(int signal_number, const char* message);
extern void psiginfo(const siginfo_t*, const char*);
extern void psignal(int, const char*);
__END_DECLS

58
tests/signal_test.cpp
View File

@@ -19,6 +19,28 @@
#include <errno.h>
#include <signal.h>
static size_t SIGNAL_MIN() {
return 1; // Signals start at 1 (SIGHUP), not 0.
}
static size_t SIGNAL_MAX() {
size_t result = SIGRTMAX;
#if defined(__BIONIC__) && !defined(__mips__) && !defined(__LP64__)
// 32-bit bionic's sigset_t is too small for ARM and x86: 32 bits instead of 64.
// This means you can't refer to any of the real-time signals.
// See http://b/3038348 and http://b/5828899.
result = 32;
#else
// Otherwise, C libraries should be perfectly capable of using their largest signal.
if (sizeof(sigset_t) * 8 < static_cast<size_t>(SIGRTMAX)) {
abort();
}
#endif
return result;
}
template <typename Fn>
static void TestSigSet1(Fn fn) {
// NULL sigset_t*.
@@ -45,19 +67,6 @@ static void TestSigSet2(Fn fn) {
sigset_t set;
sigemptyset(&set);
int min_signal = SIGHUP;
int max_signal = SIGRTMAX;
#if defined(__BIONIC__) && !defined(__mips__)
// bionic's sigset_t is too small for ARM and x86: 32 bits instead of 64.
// This means you can't refer to any of the real-time signals.
// See http://b/3038348 and http://b/5828899.
max_signal = 32;
#else
// Other C libraries (or bionic for MIPS) are perfectly capable of using their largest signal.
ASSERT_GE(sizeof(sigset_t) * 8, static_cast<size_t>(SIGRTMAX));
#endif
// Bad signal number: too small.
errno = 0;
ASSERT_EQ(-1, fn(&set, 0));
@@ -65,14 +74,14 @@ static void TestSigSet2(Fn fn) {
// Bad signal number: too high.
errno = 0;
ASSERT_EQ(-1, fn(&set, max_signal + 1));
ASSERT_EQ(-1, fn(&set, SIGNAL_MAX() + 1));
ASSERT_EQ(EINVAL, errno);
// Good signal numbers, low and high ends of range.
errno = 0;
ASSERT_EQ(0, fn(&set, min_signal));
ASSERT_EQ(0, fn(&set, SIGNAL_MIN()));
ASSERT_EQ(0, errno);
ASSERT_EQ(0, fn(&set, max_signal));
ASSERT_EQ(0, fn(&set, SIGNAL_MAX()));
ASSERT_EQ(0, errno);
}
@@ -160,7 +169,7 @@ static void SigSuspendTestHelper(int) {
++gSigSuspendTestHelperCallCount;
}
TEST(signal, sigsuspend) {
TEST(signal, sigsuspend_sigpending) {
ScopedSignalHandler ssh(SIGALRM, SigSuspendTestHelper);
// Block SIGALRM.
@@ -170,10 +179,25 @@ TEST(signal, sigsuspend) {
sigset_t original_set;
ASSERT_EQ(0, sigprocmask(SIG_BLOCK, &just_SIGALRM, &original_set));
// There should be no pending signals.
sigset_t pending;
sigemptyset(&pending);
ASSERT_EQ(0, sigpending(&pending));
for (size_t i = SIGNAL_MIN(); i <= SIGNAL_MAX(); ++i) {
EXPECT_FALSE(sigismember(&pending, i)) << i;
}
// Raise SIGALRM and check our signal handler wasn't called.
raise(SIGALRM);
ASSERT_EQ(0, gSigSuspendTestHelperCallCount);
// We should now have a pending SIGALRM but nothing else.
sigemptyset(&pending);
ASSERT_EQ(0, sigpending(&pending));
for (size_t i = SIGNAL_MIN(); i <= SIGNAL_MAX(); ++i) {
EXPECT_EQ((i == SIGALRM), sigismember(&pending, i));
}
// Use sigsuspend to block everything except SIGALRM...
sigset_t not_SIGALRM;
sigfillset(&not_SIGALRM);