#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 <signal.h>
+#include <string.h>
#include <time.h>
#include <sys/syscall.h>
#include <pthread.h>
#include <sys/eventfd.h>
#include <systemd/sd-event.h>
-#ifndef NO_JOBS_WATCHDOG
+#include "fdev.h"
+#if HAS_WATCHDOG
#include <systemd/sd-daemon.h>
#endif
#include "sig-monitor.h"
#include "verbose.h"
-#if 0
-#define _alert_ "do you really want to remove 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 defined(REMOVE_SYSTEMD_EVENT)
+#include "fdev-epoll.h"
#endif
#define EVENT_TIMEOUT_TOP ((uint64_t)-1)
int efd; /**< event notification */
struct sd_event *sdev; /**< the systemd event loop */
pthread_cond_t cond; /**< condition */
+ struct fdev *fdev; /**< handling of events */
};
#define EVLOOP_STATE_WAIT 1U
struct thread *upper; /**< upper same thread */
struct job *job; /**< currently processed job */
pthread_t tid; /**< the thread id */
- unsigned stop: 1; /**< stop requested */
- unsigned waits: 1; /**< is waiting? */
+ volatile unsigned stop: 1; /**< stop requested */
+ volatile unsigned waits: 1; /**< is waiting? */
};
/**
/* event loop */
static struct evloop evloop[1];
+#if defined(REMOVE_SYSTEMD_EVENT)
+static struct fdev_epoll *fdevepoll;
+static int waitevt;
+#endif
+
/**
* Create a new job with the given parameters
* @param group the group of the job
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);
job->callback(SIGABRT, job->arg);
}
+#if defined(REMOVE_SYSTEMD_EVENT)
+/**
+ * Gets a fdev_epoll item.
+ * @return a fdev_epoll or NULL in case of error
+ */
+static struct fdev_epoll *get_fdevepoll()
+{
+ struct fdev_epoll *result;
+
+ result = fdevepoll;
+ if (!result)
+ result = fdevepoll = fdev_epoll_create();
+
+ return result;
+}
+#endif
+
/**
* Monitored normal callback for events.
* This function is called by the monitor
struct evloop *el = arg;
if (!signum) {
+ current_evloop = el;
+ __atomic_store_n(&el->state, EVLOOP_STATE_LOCK|EVLOOP_STATE_RUN|EVLOOP_STATE_WAIT, __ATOMIC_RELAXED);
se = el->sdev;
rc = sd_event_prepare(se);
if (rc < 0) {
errno = -rc;
- ERROR("sd_event_prepare returned an error (state: %d): %m", sd_event_get_state(se));
+ CRITICAL("sd_event_prepare returned an error (state: %d): %m", sd_event_get_state(se));
+ abort();
} else {
if (rc == 0) {
rc = sd_event_wait(se, (uint64_t)(int64_t)-1);
}
+#if defined(REMOVE_SYSTEMD_EVENT)
+/**
+ * Monitored normal loop for waiting events.
+ * @param signum 0 on normal flow or the number
+ * of the signal that interrupted the normal
+ * flow
+ * @param arg the events to run
+ */
+static void monitored_wait_and_dispatch(int signum, void *arg)
+{
+ struct fdev_epoll *fdev_epoll = arg;
+ if (!signum) {
+ fdev_epoll_wait_and_dispatch(fdev_epoll, -1);
+ }
+}
+#endif
+
/**
* Main processing loop of threads processing jobs.
* The loop must be called with the mutex locked
{
struct thread **prv;
struct job *job;
+#if !defined(REMOVE_SYSTEMD_EVENT)
struct evloop *el;
+#endif
/* initialize description of itself and link it in the list */
me->tid = pthread_self();
while (!me->stop) {
/* release the event loop */
if (current_evloop) {
- __atomic_sub_fetch(¤t_evloop->state, EVLOOP_STATE_LOCK, __ATOMIC_RELAXED);
+ __atomic_and_fetch(¤t_evloop->state, ~EVLOOP_STATE_LOCK, __ATOMIC_RELAXED);
current_evloop = NULL;
}
/* get a job */
- job = job_get(first_job);
+ job = job_get();
if (job) {
/* prepare running the job */
remains++; /* increases count of job that can wait */
/* release the run job */
job_release(job);
+#if !defined(REMOVE_SYSTEMD_EVENT)
} else {
/* no job, check events */
el = &evloop[0];
me->waits = 0;
running++;
}
+#else
+ } else if (waitevt) {
+ /* no job and not events */
+ running--;
+ if (!running)
+ ERROR("Entering job deep sleep! Check your bindings.");
+ me->waits = 1;
+ pthread_cond_wait(&cond, &mutex);
+ me->waits = 0;
+ running++;
+ } else {
+ /* wait for events */
+ waitevt = 1;
+ pthread_mutex_unlock(&mutex);
+ sig_monitor(0, monitored_wait_and_dispatch, get_fdevepoll());
+ pthread_mutex_lock(&mutex);
+ waitevt = 0;
+#endif
}
}
/* release the event loop */
if (current_evloop) {
- __atomic_sub_fetch(¤t_evloop->state, EVLOOP_STATE_LOCK, __ATOMIC_RELAXED);
+ __atomic_and_fetch(¤t_evloop->state, ~EVLOOP_STATE_LOCK, __ATOMIC_RELAXED);
current_evloop = NULL;
}
* of interrupted flow, the context 'closure' as given and
* a 'jobloop' reference that must be used when the job is
* terminated to unlock the current execution flow.
- * @param arg the argument to the callback
+ * @param closure the argument to the callback
* @return 0 on success or -1 in case of error
*/
int jobs_enter(
struct evloop *evloop = userdata;
read(evloop->efd, &x, sizeof x);
pthread_mutex_lock(&mutex);
- pthread_cond_broadcast(&evloop->cond);
+ pthread_cond_broadcast(&evloop->cond);
pthread_mutex_unlock(&mutex);
return 1;
}
+/* temporary hack */
+#if !defined(REMOVE_SYSTEMD_EVENT)
+__attribute__((unused))
+#endif
+static void evloop_callback(void *arg, uint32_t event, struct fdev *fdev)
+{
+ sig_monitor(0, evloop_run, arg);
+}
+
/**
* Gets a sd_event item for the current thread.
* @return a sd_event or NULL in case of error
rc = sd_event_add_io(el->sdev, NULL, el->efd, EPOLLIN, on_evloop_efd, el);
if (rc < 0) {
ERROR("can't register eventfd");
+#if !defined(REMOVE_SYSTEMD_EVENT)
sd_event_unref(el->sdev);
el->sdev = NULL;
error2:
error1:
return NULL;
}
+#else
+ goto error3;
+ }
+ /* handle the event loop */
+ el->fdev = fdev_epoll_add(get_fdevepoll(), sd_event_get_fd(el->sdev));
+ if (!el->fdev) {
+ ERROR("can't create fdev");
+error3:
+ sd_event_unref(el->sdev);
+error2:
+ close(el->efd);
+error1:
+ memset(el, 0, sizeof *el);
+ return NULL;
+ }
+ fdev_set_autoclose(el->fdev, 0);
+ fdev_set_events(el->fdev, EPOLLIN);
+ fdev_set_callback(el->fdev, evloop_callback, el);
+#endif
}
/* attach the event loop to the current thread */
if (current_evloop != el) {
if (current_evloop)
- __atomic_sub_fetch(¤t_evloop->state, EVLOOP_STATE_LOCK, __ATOMIC_RELAXED);
+ __atomic_and_fetch(¤t_evloop->state, ~EVLOOP_STATE_LOCK, __ATOMIC_RELAXED);
current_evloop = el;
- __atomic_add_fetch(&el->state, EVLOOP_STATE_LOCK, __ATOMIC_RELAXED);
+ __atomic_or_fetch(&el->state, EVLOOP_STATE_LOCK, __ATOMIC_RELAXED);
}
/* wait for a modifiable event loop */
return result;
}
+#if defined(REMOVE_SYSTEMD_EVENT)
+/**
+ * Gets the fdev_epoll item.
+ * @return a fdev_epoll or NULL in case of error
+ */
+struct fdev_epoll *jobs_get_fdev_epoll()
+{
+ struct fdev_epoll *result;
+
+ pthread_mutex_lock(&mutex);
+ result = get_fdevepoll();
+ pthread_mutex_unlock(&mutex);
+
+ return result;
+}
+#endif
+
/**
* Enter the jobs processing loop.
* @param allowed_count Maximum count of thread for jobs including this one
goto error;
}
- /* start */
- if (sig_monitor_init() < 0) {
- ERROR("failed to initialise signal handlers");
- goto error;
- }
-
/* records the allowed count */
allowed = allowed_count;
started = 0;
running = 0;
remains = waiter_count;
-#ifndef NO_JOBS_WATCHDOG
+#if HAS_WATCHDOG
/* set the watchdog */
if (sd_watchdog_enabled(0, NULL))
sd_event_set_watchdog(get_sd_event_locked(), 1);
Code Review / src / app-framework-binder.git / blobdiff