jobs: Cosmetic changes

[src/app-framework-binder.git] / src / jobs.c

diff --git a/src/jobs.c b/src/jobs.c
index 4b753fa..42f2fbe 100644 (file)
--- a/src/jobs.c
+++ b/src/jobs.c
@@ -1,5 +1,5 @@
 /*
- * 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");
@@ -17,6 +17,12 @@
 
 #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>
@@ -29,13 +35,16 @@
 #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))
@@ -141,7 +150,7 @@ static struct job *job_create(
        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);
@@ -652,14 +661,12 @@ static int on_evloop_efd(sd_event_source *s, int fd, uint32_t revents, void *use
  * 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) {
@@ -686,7 +693,6 @@ struct sd_event *jobs_get_sd_event()
 error2:
                        close(el->efd);
 error1:
-                       pthread_mutex_unlock(&mutex);
                        return NULL;
                }
        }
@@ -706,10 +712,24 @@ error1:
                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
@@ -718,7 +738,7 @@ error1:
  * @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;
@@ -751,6 +771,12 @@ int jobs_start(int allowed_count, int start_count, int waiter_count, void (*star
        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) {
@@ -762,7 +788,7 @@ int jobs_start(int allowed_count, int start_count, int waiter_count, void (*star
        }
 
        /* 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;