X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fjobs.c;h=f30904a827ec97b5c68a67e067a3bfb89503ac17;hb=refs%2Fchanges%2F43%2F20843%2F1;hp=380845d7ad0b15003d71b82172137a02d573c2c8;hpb=043c27c3a8fd323d59e41288b6fd24f0e9bfa9a3;p=src%2Fapp-framework-binder.git

diff --git a/src/jobs.c b/src/jobs.c
index 380845d7..f30904a8 100644
--- a/src/jobs.c
+++ b/src/jobs.c
@@ -17,12 +17,6 @@
 
 #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>
@@ -36,10 +30,6 @@
 #include <sys/eventfd.h>
 
 #include <systemd/sd-event.h>
-#include "fdev.h"
-#if HAS_WATCHDOG
-#include <systemd/sd-daemon.h>
-#endif
 
 #include "jobs.h"
 #include "sig-monitor.h"
@@ -71,7 +61,6 @@ struct evloop
 	unsigned state;        /**< encoded state */
 	int efd;               /**< event notification */
 	struct sd_event *sdev; /**< the systemd event loop */
-	struct fdev *fdev;     /**< handling of events */
 	struct thread *holder; /**< holder of the evloop */
 };
 
@@ -355,6 +344,9 @@ static int evloop_get()
 	if (evloop.holder)
 		return evloop.holder == ct;
 
+	if (!evloop.sdev)
+		return 0;
+
 	ct->nholder = NULL;
 	evloop.holder = ct;
 	return 1;
@@ -889,12 +881,6 @@ 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: the current one */
 	launched = 1;
 	while (launched < start_count) {