workqueue.h (recoll-1.27.11) | : | workqueue.h (recoll-1.27.12) | ||
---|---|---|---|---|
skipping to change at line 196 | skipping to change at line 196 | |||
// Wait for all worker threads to have called workerExit() | // Wait for all worker threads to have called workerExit() | |||
m_ok = false; | m_ok = false; | |||
while (m_workers_exited < m_worker_threads.size()) { | while (m_workers_exited < m_worker_threads.size()) { | |||
m_wcond.notify_all(); | m_wcond.notify_all(); | |||
m_clients_waiting++; | m_clients_waiting++; | |||
m_ccond.wait(lock); | m_ccond.wait(lock); | |||
m_clients_waiting--; | m_clients_waiting--; | |||
} | } | |||
LOGINFO("" << m_name << ": tasks " << m_tottasks << " nowakes " << | LOGDEB("" << m_name << ": tasks " << m_tottasks << " nowakes " << | |||
m_nowake << " wsleeps " << m_workersleeps << " csleeps " << | m_nowake << " wsleeps " << m_workersleeps << " csleeps " << | |||
m_clientsleeps << "\n"); | m_clientsleeps << "\n"); | |||
// Perform the thread joins and compute overall status | // Perform the thread joins and compute overall status | |||
// Workers return (void*)1 if ok | // Workers return (void*)1 if ok | |||
void *statusall = (void*)1; | void *statusall = (void*)1; | |||
while (!m_worker_threads.empty()) { | while (!m_worker_threads.empty()) { | |||
#if HAVE_STD_FUTURE | #if HAVE_STD_FUTURE | |||
void *status = m_worker_threads.front().res.get(); | void *status = m_worker_threads.front().res.get(); | |||
#else | #else | |||
void *status = (void*) 1; | void *status = (void*) 1; | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added |