Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

queue_signalled: do not use abbreviations for member names

Browse source
This commit is contained in:
Steffen Vogel 2017-04-15 23:14:14 +02:00
parent bb547ffaf8
commit 8104f54356
3 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/villas/queue_signalled.h
View file

@ -13,9 +13,9 @@
/** Wrapper around queue that uses POSIX CV's for signalling writes. */
struct queue_signalled {
struct queue q; /**< Actual underlying queue. */
struct queue queue; /**< Actual underlying queue. */
pthread_cond_t ready; /**< Condition variable to signal writes to the queue. */
pthread_mutex_t mt; /**< Mutex for ready. */
pthread_mutex_t mutex; /**< Mutex for ready. */
};
int queue_signalled_init(struct queue_signalled *qs, size_t size, struct memtype *mem);

26
lib/queue_signalled.c
View file

@ -10,11 +10,11 @@
int queue_signalled_init(struct queue_signalled *qs, size_t size, struct memtype *mem)
{
int ret;
ret = queue_init(&qs->q, size, mem);
pthread_condattr_t cvattr;
pthread_mutexattr_t mtattr;
ret = queue_init(&qs->queue, size, mem);
if (ret < 0)
return ret;
@ -37,12 +37,12 @@ int queue_signalled_destroy(struct queue_signalled *qs)
{
int ret;
ret = queue_destroy(&qs->q);
ret = queue_destroy(&qs->queue);
if (ret < 0)
return ret;
pthread_cond_destroy(&qs->ready);
pthread_mutex_destroy(&qs->mt);
pthread_mutex_destroy(&qs->mutex);
return 0;
}
@ -51,25 +51,25 @@ int queue_signalled_push_many(struct queue_signalled *qs, void *ptr[], size_t cn
{
int ret;
ret = queue_push_many(&qs->q, ptr, cnt);
ret = queue_push_many(&qs->queue, ptr, cnt);
if (ret < 0)
return ret;
pthread_mutex_lock(&qs->mt);
pthread_mutex_lock(&qs->mutex);
pthread_cond_broadcast(&qs->ready);
pthread_mutex_unlock(&qs->mt);
pthread_mutex_unlock(&qs->mutex);
return ret;
}
int queue_signalled_pull_many(struct queue_signalled *qs, void *ptr[], size_t cnt)
{
/* Make sure that qs->mt is unlocked if this thread gets cancelled. */
pthread_cleanup_push((void (*)(void*)) pthread_mutex_unlock, &qs->mt);
pthread_mutex_lock(&qs->mt);
pthread_cond_wait(&qs->ready, &qs->mt);
pthread_mutex_unlock(&qs->mt);
/* Make sure that qs->mutex is unlocked if this thread gets cancelled. */
pthread_cleanup_push((void (*)(void*)) pthread_mutex_unlock, &qs->mutex);
pthread_mutex_lock(&qs->mutex);
pthread_cond_wait(&qs->ready, &qs->mutex);
pthread_mutex_unlock(&qs->mutex);
pthread_cleanup_pop(0);
return queue_pull_many(&qs->q, ptr, cnt);
return queue_pull_many(&qs->queue, ptr, cnt);
}

4
lib/shmem.c
View file

@ -82,9 +82,9 @@ int shmem_shared_close(struct shmem_shared *shm, void *base)
atomic_store_explicit(&shm->ext_stopped, 1, memory_order_relaxed);
if (!shm->polling) {
pthread_mutex_lock(&shm->in.qs.mt);
pthread_mutex_lock(&shm->in.qs.mutex);
pthread_cond_broadcast(&shm->in.qs.ready);
pthread_mutex_unlock(&shm->in.qs.mt);
pthread_mutex_unlock(&shm->in.qs.mutex);
}
return munmap(base, shm->len);