/*
- * Copyright (C) 2016, 2017 "IoT.bzh"
+ * Copyright (C) 2016, 2017, 2018 "IoT.bzh"
* Author José Bollo <jose.bollo@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
#define _GNU_SOURCE
+#if defined(NO_JOBS_WATCHDOG)
+# define HAS_WATCHDOG 0
+#else
+# define HAS_WATCHDOG 1
+#endif
+
#include <stdlib.h>
#include <stdint.h>
#include <unistd.h>
#include <sys/eventfd.h>
#include <systemd/sd-event.h>
+#if HAS_WATCHDOG
+#include <systemd/sd-daemon.h>
+#endif
#include "jobs.h"
#include "sig-monitor.h"
#include "verbose.h"
#if 0
-#define _alert_ "do you really want to remove monitoring?"
+#define _alert_ "do you really want to remove signal monitoring?"
#define sig_monitor_init_timeouts() ((void)0)
#define sig_monitor_clean_timeouts() ((void)0)
#define sig_monitor(to,cb,arg) (cb(0,arg))
if (job)
free_jobs = job->next;
else {
- /* allocation without blocking */
+ /* allocation without blocking */
pthread_mutex_unlock(&mutex);
job = malloc(sizeof *job);
pthread_mutex_lock(&mutex);
ERROR("sd_event_wait returned an error (state: %d): %m", sd_event_get_state(se));
}
}
- el->state &= ~(EVLOOP_STATE_WAIT);
+ __atomic_and_fetch(&el->state, ~(EVLOOP_STATE_WAIT), __ATOMIC_RELAXED);
if (rc > 0) {
rc = sd_event_dispatch(se);
}
}
}
- el->state &= ~(EVLOOP_STATE_WAIT|EVLOOP_STATE_RUN);
+ __atomic_and_fetch(&el->state, ~(EVLOOP_STATE_WAIT|EVLOOP_STATE_RUN), __ATOMIC_RELAXED);
}
/* loop until stopped */
while (!me->stop) {
/* release the event loop */
- if (current_evloop && !(current_evloop->state & EVLOOP_STATE_RUN)) {
- current_evloop->state -= EVLOOP_STATE_LOCK;
+ if (current_evloop) {
+ __atomic_sub_fetch(¤t_evloop->state, EVLOOP_STATE_LOCK, __ATOMIC_RELAXED);
current_evloop = NULL;
}
} else {
/* no job, check events */
el = &evloop[0];
- if (el->sdev && !el->state) {
+ if (el->sdev && !__atomic_load_n(&el->state, __ATOMIC_RELAXED)) {
/* run the events */
- el->state = EVLOOP_STATE_LOCK|EVLOOP_STATE_RUN|EVLOOP_STATE_WAIT;
+ __atomic_store_n(&el->state, EVLOOP_STATE_LOCK|EVLOOP_STATE_RUN|EVLOOP_STATE_WAIT, __ATOMIC_RELAXED);
current_evloop = el;
pthread_mutex_unlock(&mutex);
sig_monitor(0, evloop_run, el);
}
}
+ /* release the event loop */
+ if (current_evloop) {
+ __atomic_sub_fetch(¤t_evloop->state, EVLOOP_STATE_LOCK, __ATOMIC_RELAXED);
+ current_evloop = NULL;
+ }
+
/* unlink the current thread and cleanup */
prv = &threads;
while (*prv != me)
uint64_t x;
struct evloop *evloop = userdata;
read(evloop->efd, &x, sizeof x);
- pthread_cond_signal(&evloop->cond);
+ pthread_mutex_lock(&mutex);
+ pthread_cond_broadcast(&evloop->cond);
+ pthread_mutex_unlock(&mutex);
return 1;
}
* Gets a sd_event item for the current thread.
* @return a sd_event or NULL in case of error
*/
-struct sd_event *jobs_get_sd_event()
+static struct sd_event *get_sd_event_locked()
{
struct evloop *el;
uint64_t x;
int rc;
- pthread_mutex_lock(&mutex);
-
/* creates the evloop on need */
el = &evloop[0];
if (!el->sdev) {
+ /* start the creation */
+ el->state = 0;
/* creates the eventfd for waking up polls */
- el->efd = eventfd(0, EFD_CLOEXEC|EFD_SEMAPHORE);
+ el->efd = eventfd(0, EFD_CLOEXEC);
if (el->efd < 0) {
ERROR("can't make eventfd for events");
goto error1;
error2:
close(el->efd);
error1:
- pthread_mutex_unlock(&mutex);
return NULL;
}
- /* terminate creation */
- el->state = 0;
}
/* attach the event loop to the current thread */
if (current_evloop != el) {
if (current_evloop)
- current_evloop->state -= EVLOOP_STATE_LOCK;
+ __atomic_sub_fetch(¤t_evloop->state, EVLOOP_STATE_LOCK, __ATOMIC_RELAXED);
current_evloop = el;
- el->state += EVLOOP_STATE_LOCK;
+ __atomic_add_fetch(&el->state, EVLOOP_STATE_LOCK, __ATOMIC_RELAXED);
}
/* wait for a modifiable event loop */
- while (el->state & EVLOOP_STATE_WAIT) {
+ while (__atomic_load_n(&el->state, __ATOMIC_RELAXED) & EVLOOP_STATE_WAIT) {
x = 1;
write(el->efd, &x, sizeof x);
pthread_cond_wait(&el->cond, &mutex);
}
- pthread_mutex_unlock(&mutex);
return el->sdev;
}
+/**
+ * Gets a sd_event item for the current thread.
+ * @return a sd_event or NULL in case of error
+ */
+struct sd_event *jobs_get_sd_event()
+{
+ struct sd_event *result;
+
+ pthread_mutex_lock(&mutex);
+ result = get_sd_event_locked();
+ pthread_mutex_unlock(&mutex);
+
+ return result;
+}
+
/**
* Enter the jobs processing loop.
* @param allowed_count Maximum count of thread for jobs including this one
* @param start The start routine to activate (can't be NULL)
* @return 0 in case of success or -1 in case of error.
*/
-int jobs_start(int allowed_count, int start_count, int waiter_count, void (*start)(int signum))
+int jobs_start(int allowed_count, int start_count, int waiter_count, void (*start)(int signum, void* arg), void *arg)
{
int rc, launched;
struct thread me;
running = 0;
remains = waiter_count;
+#if HAS_WATCHDOG
+ /* set the watchdog */
+ if (sd_watchdog_enabled(0, NULL))
+ sd_event_set_watchdog(get_sd_event_locked(), 1);
+#endif
+
/* start at least one thread */
launched = 0;
while ((launched + 1) < start_count) {
}
/* queue the start job */
- job = job_create(NULL, 0, (job_cb_t)start, NULL);
+ job = job_create(NULL, 0, start, arg);
if (!job) {
ERROR("out of memory");
errno = ENOMEM;