github/open62541
7
0
Fork 0
mirror of https://github.com/open62541/open62541.git synced 2025-06-03 04:00:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix use of worker mutexes with pthread_cond

Browse Source 
The patch was provided by @janitza-luwe in #949
This commit is contained in:
janitza-luwe 2017-01-26 10:51:08 +01:00 committed by Julius Pfrommer
parent e39c5874da
commit 51d04c438b
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/server/ua_server.c
View File

@ -266,6 +266,7 @@ void UA_Server_delete(UA_Server *server) {
#ifdef UA_ENABLE_MULTITHREADING
pthread_cond_destroy(&server->dispatchQueue_condition);
pthread_mutex_destroy(&server->dispatchQueue_mutex);
#endif
UA_free(server);
}

1
src/server/ua_server_internal.h
View File

@ -120,6 +120,7 @@ struct UA_Server {
by worker threads */
struct DelayedJobs *delayedJobs;
pthread_cond_t dispatchQueue_condition; /* so the workers don't spin if the queue is empty */
pthread_mutex_t dispatchQueue_mutex; /* mutex for access to condition variable */
struct cds_wfcq_tail dispatchQueue_tail; /* Dispatch queue tail for the worker threads */
#endif

11
src/server/ua_server_worker.c
View File

@ -99,10 +99,6 @@ workerLoop(UA_Worker *worker) {
UA_random_seed((uintptr_t)worker);
rcu_register_thread();
pthread_mutex_t mutex; // required for the condition variable
pthread_mutex_init(&mutex, 0);
pthread_mutex_lock(&mutex);
while(*running) {
struct DispatchJob *dj = (struct DispatchJob*)
cds_wfcq_dequeue_blocking(&server->dispatchQueue_head, &server->dispatchQueue_tail);
@ -111,13 +107,13 @@ workerLoop(UA_Worker *worker) {
UA_free(dj);
} else {
/* nothing to do. sleep until a job is dispatched (and wakes up all worker threads) */
pthread_cond_wait(&server->dispatchQueue_condition, &mutex);
pthread_mutex_lock(&server->dispatchQueue_mutex);
pthread_cond_wait(&server->dispatchQueue_condition, &server->dispatchQueue_mutex);
pthread_mutex_unlock(&server->dispatchQueue_mutex);
}
UA_atomic_add(counter, 1);
}
pthread_mutex_unlock(&mutex);
pthread_mutex_destroy(&mutex);
UA_ASSERT_RCU_UNLOCKED();
rcu_barrier(); // wait for all scheduled call_rcu work to complete
rcu_unregister_thread();
@ -537,6 +533,7 @@ UA_StatusCode UA_Server_run_startup(UA_Server *server) {
UA_LOG_INFO(server->config.logger, UA_LOGCATEGORY_SERVER,
"Spinning up %u worker thread(s)", server->config.nThreads);
pthread_cond_init(&server->dispatchQueue_condition, 0);
pthread_mutex_init(&server->dispatchQueue_mutex, 0);
server->workers = UA_malloc(server->config.nThreads * sizeof(UA_Worker));
if(!server->workers)
return UA_STATUSCODE_BADOUTOFMEMORY;