diff options
author | antirez <antirez@gmail.com> | 2012-03-27 13:48:53 +0200 |
---|---|---|
committer | antirez <antirez@gmail.com> | 2012-03-27 13:48:57 +0200 |
commit | aa96122d968308f77c4d26ba24c6ec9727b4e88b (patch) | |
tree | 96527c7cc66b5e8c0c820b021a1bb090602b5d7c | |
parent | a354da9acd8afbe4e600360ef6502c10dfed3ccb (diff) | |
download | redis-aa96122d968308f77c4d26ba24c6ec9727b4e88b.tar.gz |
Mask SIGALRM everything but in the main thread.
This is required to ensure that the signal will be delivered to the main
thread when the watchdog timer expires.
-rw-r--r-- | src/bio.c | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -108,9 +108,18 @@ void bioCreateBackgroundJob(int type, void *arg1, void *arg2, void *arg3) { void *bioProcessBackgroundJobs(void *arg) { struct bio_job *job; unsigned long type = (unsigned long) arg; + sigset_t sigset; pthread_detach(pthread_self()); pthread_mutex_lock(&bio_mutex[type]); + /* Block SIGALRM so we are sure that only the main thread will + * receive the watchdog signal. */ + sigemptyset(&sigset); + sigaddset(&sigset, SIGALRM); + if (pthread_sigmask(SIG_BLOCK, &sigset, NULL)) + redisLog(REDIS_WARNING, + "Warning: can't mask SIGALRM in bio.c thread: %s", strerror(errno)); + while(1) { listNode *ln; |