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

cmake: make use of HAS_EVENTFD

Browse source
This commit is contained in:
Steffen Vogel 2018-06-21 09:37:30 +02:00
parent 58e4d7e394
commit 4fa5914bc6
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/villas/queue_signalled.h
View file

@ -36,7 +36,7 @@ enum queue_signalled_flags {
QUEUE_SIGNALLED_AUTO = (0 << 0), /**< We will choose the best method available on the platform */
QUEUE_SIGNALLED_PTHREAD = (1 << 0),
QUEUE_SIGNALLED_POLLING = (2 << 0),
#ifdef __linux__
#ifdef HAS_EVENTFD
QUEUE_SIGNALLED_EVENTFD = (3 << 0),
#elif defined(__APPLE__)
QUEUE_SIGNALLED_PIPE = (3 << 0),

19
lib/queue_signalled.c
View file

@ -21,10 +21,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************************/
#include <villas/config.h>
#include <villas/queue_signalled.h>
#include <villas/log.h>
#ifdef __linux__
#ifdef HAS_EVENTFD
#include <sys/eventfd.h>
#endif
@ -83,7 +84,7 @@ int queue_signalled_init(struct queue_signalled *qs, size_t size, struct memtype
else if (qs->mode == QUEUE_SIGNALLED_POLLING) {
/* Nothing todo */
}
#ifdef __linux__
#ifdef HAS_EVENTFD
else if (qs->mode == QUEUE_SIGNALLED_EVENTFD) {
qs->eventfd = eventfd(0, 0);
if (qs->eventfd < 0)
@ -117,7 +118,7 @@ int queue_signalled_destroy(struct queue_signalled *qs)
else if (qs->mode == QUEUE_SIGNALLED_POLLING) {
/* Nothing todo */
}
#ifdef __linux__
#ifdef HAS_EVENTFD
else if (qs->mode == QUEUE_SIGNALLED_EVENTFD) {
ret = close(qs->eventfd);
if (ret)
@ -152,7 +153,7 @@ int queue_signalled_push(struct queue_signalled *qs, void *ptr)
else if (qs->mode == QUEUE_SIGNALLED_POLLING) {
/* Nothing todo */
}
#ifdef __linux__
#ifdef HAS_EVENTFD
else if (qs->mode == QUEUE_SIGNALLED_EVENTFD) {
int ret;
uint64_t incr = 1;
@ -191,7 +192,7 @@ int queue_signalled_push_many(struct queue_signalled *qs, void *ptr[], size_t cn
else if (qs->mode == QUEUE_SIGNALLED_POLLING) {
/* Nothing todo */
}
#ifdef __linux__
#ifdef HAS_EVENTFD
else if (qs->mode == QUEUE_SIGNALLED_EVENTFD) {
int ret;
uint64_t incr = 1;
@ -233,7 +234,7 @@ int queue_signalled_pull(struct queue_signalled *qs, void **ptr)
pthread_cond_wait(&qs->pthread.ready, &qs->pthread.mutex);
else if (qs->mode == QUEUE_SIGNALLED_POLLING)
continue; /* Try again */
#ifdef __linux__
#ifdef HAS_EVENTFD
else if (qs->mode == QUEUE_SIGNALLED_EVENTFD) {
int ret;
uint64_t cntr;
@ -282,7 +283,7 @@ int queue_signalled_pull_many(struct queue_signalled *qs, void *ptr[], size_t cn
pthread_cond_wait(&qs->pthread.ready, &qs->pthread.mutex);
else if (qs->mode == QUEUE_SIGNALLED_POLLING)
continue; /* Try again */
#ifdef __linux__
#ifdef HAS_EVENTFD
else if (qs->mode == QUEUE_SIGNALLED_EVENTFD) {
int ret;
uint64_t cntr;
@ -328,7 +329,7 @@ int queue_signalled_close(struct queue_signalled *qs)
else if (qs->mode == QUEUE_SIGNALLED_POLLING) {
/* Nothing todo */
}
#ifdef __linux__
#ifdef HAS_EVENTFD
else if (qs->mode == QUEUE_SIGNALLED_EVENTFD) {
int ret;
uint64_t incr = 1;
@ -356,7 +357,7 @@ int queue_signalled_close(struct queue_signalled *qs)
int queue_signalled_fd(struct queue_signalled *qs)
{
switch (qs->mode) {
#ifdef __linux__
#ifdef HAS_EVENTFD
case QUEUE_SIGNALLED_EVENTFD:
return qs->eventfd;
#elif defined(__APPLE__)