X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fjobs.c;h=952720bd78cd3f1a9cac0f96f9fd6d09c1e25741;hb=e88c6e83a85c5bcdce7bc02081bf62d117bb2e28;hp=4b753fa1ffdb9508576da20120acf93367855296;hpb=5ed38596a529c1a63d6a3fab72861d14fbf1401c;p=src%2Fapp-framework-binder.git

diff --git a/src/jobs.c b/src/jobs.c
index 4b753fa1..952720bd 100644
--- a/src/jobs.c
+++ b/src/jobs.c
@@ -29,6 +29,9 @@
 #include <sys/eventfd.h>
 
 #include <systemd/sd-event.h>
+#ifndef NO_JOBS_WATCHDOG
+#include <systemd/sd-daemon.h>
+#endif
 
 #include "jobs.h"
 #include "sig-monitor.h"
@@ -652,14 +655,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 +687,6 @@ struct sd_event *jobs_get_sd_event()
 error2:
 			close(el->efd);
 error1:
-			pthread_mutex_unlock(&mutex);
 			return NULL;
 		}
 	}
@@ -706,10 +706,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 +732,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 +765,12 @@ int jobs_start(int allowed_count, int start_count, int waiter_count, void (*star
 	running = 0;
 	remains = waiter_count;
 
+#ifndef NO_JOBS_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 +782,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;