mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-04-24 18:40:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge seastar upstream

Browse Source
This commit is contained in:
Avi Kivity
2015-07-07 18:11:57 +03:00
parent 8e2d36ed74 19206a038f
commit a7d608b33a
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/reactor.cc
View File

@@ -179,6 +179,12 @@ void reactor::signals::action(int signo, siginfo_t* siginfo, void* ignore) {
engine()._signals._pending_signals.fetch_or(1ull << signo, std::memory_order_relaxed);
}
inline int alarm_signal() {
// We don't want to use SIGALRM, because the boost unit test library
// also plays with it.
return SIGRTMIN;
}
reactor::reactor()
: _backend()
#ifdef HAVE_OSV
@@ -201,12 +207,12 @@ reactor::reactor()
struct sigevent sev;
sev.sigev_notify = SIGEV_THREAD_ID;
sev._sigev_un._tid = syscall(SYS_gettid);
sev.sigev_signo = SIGALRM;
sev.sigev_signo = alarm_signal();
r = timer_create(CLOCK_REALTIME, &sev, &_timer);
assert(r >= 0);
sigset_t mask;
sigemptyset(&mask);
sigaddset(&mask, SIGALRM);
sigaddset(&mask, alarm_signal());
r = ::sigprocmask(SIG_BLOCK, &mask, NULL);
assert(r == 0);
#endif
@@ -1044,7 +1050,7 @@ int reactor::run() {
}
#ifndef HAVE_OSV
_signals.handle_signal(SIGALRM, [this] {
_signals.handle_signal(alarm_signal(), [this] {
complete_timers(_timers, _expired_timers, [this] {
if (!_timers.empty()) {
enable_timer(_timers.get_next_timeout());