detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-13 13:27:14 +02:00
Code Issues Actions Packages Releases Activity

resolved warnings, also from esrf: todo: include changes in zmq

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-05-01 13:11:10 +02:00
parent e9f6dcf479
commit 445da80df8
14 changed files with 179 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/threadFiles/ThreadPool.cpp
View File

@ -67,12 +67,13 @@ int ThreadPool::destroy_threadpool(){
/*cout << "Broadcasting STOP signal to all threads..." << endl;*/
m_task_cond_var.broadcast(); // notify all threads we are shttung down
int ret = -1;
// int ret = -1;
for (int i = 0; i < m_pool_size; i++) {
void* result;
sem_post(&semStart);
sem_post(&semDone);
ret = pthread_join(m_threads[i], &result);
//ret =
pthread_join(m_threads[i], &result);
/*cout << "pthread_join() returned " << ret << ": " << strerror(errno) << endl;*/
m_task_cond_var.broadcast(); // try waking up a bunch of threads that are still waiting
}
@ -85,7 +86,8 @@ int ThreadPool::destroy_threadpool(){
}
void* ThreadPool::execute_thread(){
int ithread = current_thread_number;
//for debugging seting ithread value
// int ithread = current_thread_number;
thread_started = true;
Task* task = NULL;
m_tasks_loaded = false;