iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Block all signals in DNS threads

Browse Source 
A DNS thread should never handle any kind of signal. The main thread is
responsible for handling signals and it does so without any kind of locking.

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter
2012-02-19 12:26:19 +01:00
parent 252e6d7151
commit 1dd8d9bf3e
1 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Socket.cpp
View File

@@ -10,6 +10,7 @@
#include <znc/Modules.h>
#include <znc/User.h>
#include <znc/znc.h>
#include <signal.h>
/* We should need 2 DNS threads (host, bindhost) per IRC connection */
static const size_t MAX_IDLE_THREADS = 2;
@@ -169,6 +170,21 @@ void CSockManager::StartTDNSThread(TDNSTask* task, bool bBind) {
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
pthread_t thr;
sigset_t old_sigmask;
sigset_t sigmask;
sigfillset(&sigmask);
/* Block all signals. The thread will inherit our signal mask and thus
* won't ever try to handle any signals.
*/
if (pthread_sigmask(SIG_SETMASK, &sigmask, &old_sigmask)) {
CString sError = "Couldn't block signals";
DEBUG(sError);
CZNC::Get().Broadcast(sError, /* bAdminOnly = */ true);
delete arg;
pthread_attr_destroy(&attr);
SetTDNSThreadFinished(task, bBind, NULL);
return;
}
if (pthread_create(&thr, &attr, TDNSThread, &m_threadStatus)) {
CString sError = "Couldn't create thread for " + sHostname;
DEBUG(sError);
@@ -178,6 +194,15 @@ void CSockManager::StartTDNSThread(TDNSTask* task, bool bBind) {
SetTDNSThreadFinished(task, bBind, NULL);
return;
}
if (pthread_sigmask(SIG_SETMASK, &old_sigmask, NULL)) {
CString sError = "Couldn't unblock signals";
DEBUG(sError);
CZNC::Get().Broadcast(sError, /* bAdminOnly = */ true);
delete arg;
pthread_attr_destroy(&attr);
SetTDNSThreadFinished(task, bBind, NULL);
return;
}
pthread_attr_destroy(&attr);
}