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

Merge "Fix the setjmp tests for mips."

Browse Source
This commit is contained in:
Elliott Hughes 2014-12-10 20:04:52 +00:00 committed by Gerrit Code Review
commit 3a49cfe3f2
1 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
tests/setjmp_test.cpp
View File

@ -63,15 +63,27 @@ TEST(setjmp, sigsetjmp_1_smoke) {
} }
} }
static sigset_t SigSetOf(int signal, int rt_signal = 0) { // Two distinct signal sets, pipu
sigset_t ss; struct SigSets {
sigemptyset(&ss); SigSets() : one(MakeSigSet(0)), two(MakeSigSet(1)) {
sigaddset(&ss, signal);
if (rt_signal != 0) {
sigaddset(&ss, rt_signal);
} }
return ss;
} static sigset_t MakeSigSet(int offset) {
sigset_t ss;
sigemptyset(&ss);
sigaddset(&ss, SIGUSR1 + offset);
#if defined(__LP64__)
// For arm and x86, sigset_t was too small for the RT signals.
// For mips, sigset_t was large enough but jmp_buf wasn't.
sigaddset(&ss, SIGRTMIN + offset);
#endif
return ss;
}
sigset_t one;
sigset_t two;
sigset_t original;
};
void AssertSigmaskEquals(const sigset_t& expected) { void AssertSigmaskEquals(const sigset_t& expected) {
sigset_t actual; sigset_t actual;
@ -84,76 +96,68 @@ void AssertSigmaskEquals(const sigset_t& expected) {
TEST(setjmp, _setjmp_signal_mask) { TEST(setjmp, _setjmp_signal_mask) {
// _setjmp/_longjmp do not save/restore the signal mask. // _setjmp/_longjmp do not save/restore the signal mask.
sigset_t ss1(SigSetOf(SIGUSR1, SIGRTMIN + 8)); SigSets ss;
sigset_t ss2(SigSetOf(SIGUSR2, SIGRTMIN + 9)); sigprocmask(SIG_SETMASK, &ss.one, &ss.original);
sigset_t original_set;
sigprocmask(SIG_SETMASK, &ss1, &original_set);
jmp_buf jb; jmp_buf jb;
if (_setjmp(jb) == 0) { if (_setjmp(jb) == 0) {
sigprocmask(SIG_SETMASK, &ss2, NULL); sigprocmask(SIG_SETMASK, &ss.two, NULL);
_longjmp(jb, 1); _longjmp(jb, 1);
FAIL(); // Unreachable. FAIL(); // Unreachable.
} else { } else {
AssertSigmaskEquals(ss2); AssertSigmaskEquals(ss.two);
} }
sigprocmask(SIG_SETMASK, &original_set, NULL); sigprocmask(SIG_SETMASK, &ss.original, NULL);
} }
TEST(setjmp, setjmp_signal_mask) { TEST(setjmp, setjmp_signal_mask) {
// setjmp/longjmp do save/restore the signal mask on bionic, but not on glibc. // setjmp/longjmp do save/restore the signal mask on bionic, but not on glibc.
// This is a BSD versus System V historical accident. POSIX leaves the // This is a BSD versus System V historical accident. POSIX leaves the
// behavior unspecified, so any code that cares needs to use sigsetjmp. // behavior unspecified, so any code that cares needs to use sigsetjmp.
sigset_t ss1(SigSetOf(SIGUSR1, SIGRTMIN + 8)); SigSets ss;
sigset_t ss2(SigSetOf(SIGUSR2, SIGRTMIN + 9)); sigprocmask(SIG_SETMASK, &ss.one, &ss.original);
sigset_t original_set;
sigprocmask(SIG_SETMASK, &ss1, &original_set);
jmp_buf jb; jmp_buf jb;
if (setjmp(jb) == 0) { if (setjmp(jb) == 0) {
sigprocmask(SIG_SETMASK, &ss2, NULL); sigprocmask(SIG_SETMASK, &ss.two, NULL);
longjmp(jb, 1); longjmp(jb, 1);
FAIL(); // Unreachable. FAIL(); // Unreachable.
} else { } else {
#if defined(__BIONIC__) #if defined(__BIONIC__)
// bionic behaves like BSD and does save/restore the signal mask. // bionic behaves like BSD and does save/restore the signal mask.
AssertSigmaskEquals(ss1); AssertSigmaskEquals(ss.one);
#else #else
// glibc behaves like System V and doesn't save/restore the signal mask. // glibc behaves like System V and doesn't save/restore the signal mask.
AssertSigmaskEquals(ss2); AssertSigmaskEquals(ss.two);
#endif #endif
} }
sigprocmask(SIG_SETMASK, &original_set, NULL); sigprocmask(SIG_SETMASK, &ss.original, NULL);
} }
TEST(setjmp, sigsetjmp_0_signal_mask) { TEST(setjmp, sigsetjmp_0_signal_mask) {
// sigsetjmp(0)/siglongjmp do not save/restore the signal mask. // sigsetjmp(0)/siglongjmp do not save/restore the signal mask.
sigset_t ss1(SigSetOf(SIGUSR1, SIGRTMIN + 8)); SigSets ss;
sigset_t ss2(SigSetOf(SIGUSR2, SIGRTMIN + 9)); sigprocmask(SIG_SETMASK, &ss.one, &ss.original);
sigset_t original_set;
sigprocmask(SIG_SETMASK, &ss1, &original_set);
sigjmp_buf sjb; sigjmp_buf sjb;
if (sigsetjmp(sjb, 0) == 0) { if (sigsetjmp(sjb, 0) == 0) {
sigprocmask(SIG_SETMASK, &ss2, NULL); sigprocmask(SIG_SETMASK, &ss.two, NULL);
siglongjmp(sjb, 1); siglongjmp(sjb, 1);
FAIL(); // Unreachable. FAIL(); // Unreachable.
} else { } else {
AssertSigmaskEquals(ss2); AssertSigmaskEquals(ss.two);
} }
sigprocmask(SIG_SETMASK, &original_set, NULL); sigprocmask(SIG_SETMASK, &ss.original, NULL);
} }
TEST(setjmp, sigsetjmp_1_signal_mask) { TEST(setjmp, sigsetjmp_1_signal_mask) {
// sigsetjmp(1)/siglongjmp does save/restore the signal mask. // sigsetjmp(1)/siglongjmp does save/restore the signal mask.
sigset_t ss1(SigSetOf(SIGUSR1, SIGRTMIN + 8)); SigSets ss;
sigset_t ss2(SigSetOf(SIGUSR2, SIGRTMIN + 9)); sigprocmask(SIG_SETMASK, &ss.one, &ss.original);
sigset_t original_set;
sigprocmask(SIG_SETMASK, &ss1, &original_set);
sigjmp_buf sjb; sigjmp_buf sjb;
if (sigsetjmp(sjb, 1) == 0) { if (sigsetjmp(sjb, 1) == 0) {
sigprocmask(SIG_SETMASK, &ss2, NULL); sigprocmask(SIG_SETMASK, &ss.two, NULL);
siglongjmp(sjb, 1); siglongjmp(sjb, 1);
FAIL(); // Unreachable. FAIL(); // Unreachable.
} else { } else {
AssertSigmaskEquals(ss1); AssertSigmaskEquals(ss.one);
} }
sigprocmask(SIG_SETMASK, &original_set, NULL); sigprocmask(SIG_SETMASK, &ss.original, NULL);
} }