4b1c6e7385
The main motivation here is that the sigprocmask in pthread_exit wasn't actually blocking the real-time signals, and debuggerd (amongst other things) is using them. I wasn't able to write a test that actually won that race but I did write an equivalent one for posix_spawn. This also fixes all the uses of sigset_t where the sigset_t isn't exposed to the outside (which we can't easily fix because it would be an ABI change). Bug: https://issuetracker.google.com/72291624 Test: ran tests Change-Id: Ib6eebebc5a7b0150079f1cb79593247917dcf750
47 lines
1.2 KiB
C++
47 lines
1.2 KiB
C++
/*
|
|
* Copyright (C) 2017 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef SCOPED_SIGNAL_BLOCKER_H
|
|
#define SCOPED_SIGNAL_BLOCKER_H
|
|
|
|
#include <signal.h>
|
|
|
|
#include "bionic_macros.h"
|
|
#include "kernel_sigset_t.h"
|
|
|
|
class ScopedSignalBlocker {
|
|
public:
|
|
explicit ScopedSignalBlocker() {
|
|
kernel_sigset_t set;
|
|
set.fill();
|
|
__rt_sigprocmask(SIG_SETMASK, &set, &old_set_, sizeof(set));
|
|
}
|
|
|
|
~ScopedSignalBlocker() {
|
|
reset();
|
|
}
|
|
|
|
void reset() {
|
|
__rt_sigprocmask(SIG_SETMASK, &old_set_, nullptr, sizeof(old_set_));
|
|
}
|
|
|
|
private:
|
|
kernel_sigset_t old_set_;
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(ScopedSignalBlocker);
|
|
};
|
|
|
|
#endif
|