tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

only call x11IsAlive from the main thread

Browse Source
This commit is contained in:
dockes 2009-10-15 12:32:59 +00:00
parent 8a6c6a0026
commit 0943836614
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/index/rclmonprc.cpp
View File

@ -176,16 +176,12 @@ bool RclMonEventQueue::ok()
LOGDEB(("RclMonEventQueue: not ok: bad state\n"));
return false;
}
if (!(m_data->m_opts & RCLMON_NOX11) && !x11IsAlive()) {
LOGDEB(("RclMonEventQueue: not ok: x11\n"));
return false;
}
if (stopindexing) {
LOGDEB(("RclMonEventQueue: not ok: stop request\n"));
return false;
}
if (!m_data->m_ok) {
LOGDEB(("RclMonEventQueue: not ok: end from rcv\n"));
LOGDEB(("RclMonEventQueue: not ok: queue terminated\n"));
return false;
}
return true;
@ -306,7 +302,12 @@ bool startMonitor(RclConfig *conf, int opts)
while (rclEQ.wait(2, &timedout)) {
// Queue is locked.
if (!rclEQ.ok()) {
// x11IsAlive() can't be called from ok() because both threads call it
// and Xlib is not multithreaded.
bool x11dead = !(opts & RCLMON_NOX11) && !x11IsAlive();
if (x11dead)
LOGDEB(("RclMonprc: x11 is dead\n"));
if (!rclEQ.ok() || x11dead) {
rclEQ.unlock();
break;
}
@ -362,6 +363,7 @@ bool startMonitor(RclConfig *conf, int opts)
// Lock queue before waiting again
rclEQ.lock();
}
LOGDEB(("Rclmonprc: calling queue setTerminate\n"));
rclEQ.setTerminate();
// Wait for receiver thread before returning
pthread_join(rcv_thrid, 0);