X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fjobs.c;h=9768f269e503e4895cf353479aae139d503ad71f;hb=72385abda940862a920442a330fb6aa82673400f;hp=9c81700a54f84535a3b6900ca54488603c353ae3;hpb=cab05ba72abeb335b456b0820e053c94b91986e7;p=src%2Fapp-framework-binder.git

diff --git a/src/jobs.c b/src/jobs.c
index 9c81700a..9768f269 100644
--- a/src/jobs.c
+++ b/src/jobs.c
@@ -42,15 +42,11 @@
 #endif
 
 #include "jobs.h"
-#include "fdev-epoll.h"
 #include "sig-monitor.h"
 #include "verbose.h"
 
-#if 0
-#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 defined(REMOVE_SYSTEMD_EVENT)
+#include "fdev-epoll.h"
 #endif
 
 #define EVENT_TIMEOUT_TOP  	((uint64_t)-1)
@@ -92,8 +88,8 @@ struct thread
 	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? */
 };
 
 /**
@@ -132,8 +128,11 @@ static struct job *free_jobs;
 
 /* 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
@@ -161,7 +160,7 @@ static struct job *job_create(
 		job = malloc(sizeof *job);
 		pthread_mutex_lock(&mutex);
 		if (!job) {
-			errno = -ENOMEM;
+			errno = ENOMEM;
 			goto end;
 		}
 	}
@@ -267,6 +266,7 @@ static void job_cancel(int signum, void *arg)
 	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
@@ -281,6 +281,7 @@ static struct fdev_epoll *get_fdevepoll()
 
 	return result;
 }
+#endif
 
 /**
  * Monitored normal callback for events.
@@ -305,7 +306,8 @@ static void evloop_run(int signum, void *arg)
 		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);
@@ -329,6 +331,7 @@ static void evloop_run(int signum, void *arg)
 }
 
 
+#if defined(REMOVE_SYSTEMD_EVENT)
 /**
  * Monitored normal loop for waiting events.
  * @param signum 0 on normal flow or the number
@@ -343,6 +346,7 @@ static void monitored_wait_and_dispatch(int signum, void *arg)
 		fdev_epoll_wait_and_dispatch(fdev_epoll, -1);
 	}
 }
+#endif
 
 /**
  * Main processing loop of threads processing jobs.
@@ -355,6 +359,9 @@ static void thread_run(volatile struct thread *me)
 {
 	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();
@@ -378,7 +385,7 @@ static void thread_run(volatile struct thread *me)
 		}
 
 		/* 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 */
@@ -392,6 +399,28 @@ static void thread_run(volatile struct thread *me)
 
 			/* release the run job */
 			job_release(job);
+#if !defined(REMOVE_SYSTEMD_EVENT)
+		} else {
+			/* no job, check events */
+			el = &evloop[0];
+			if (el->sdev && !__atomic_load_n(&el->state, __ATOMIC_RELAXED)) {
+				/* run the events */
+				__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);
+				pthread_mutex_lock(&mutex);
+			} else {
+				/* 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
 		} else if (waitevt) {
 			/* no job and not events */
 			running--;
@@ -408,6 +437,7 @@ static void thread_run(volatile struct thread *me)
 			sig_monitor(0, monitored_wait_and_dispatch, get_fdevepoll());
 			pthread_mutex_lock(&mutex);
 			waitevt = 0;
+#endif
 		}
 	}
 
@@ -604,7 +634,7 @@ static int do_sync(
  *                 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(
@@ -685,12 +715,15 @@ static int on_evloop_efd(sd_event_source *s, int fd, uint32_t revents, void *use
 	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);
@@ -727,6 +760,15 @@ static struct sd_event *get_sd_event_locked()
 		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:
+			close(el->efd);
+error1:
+			return NULL;
+		}
+#else
 			goto error3;
 		}
 		/* handle the event loop */
@@ -744,6 +786,7 @@ error1:
 		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 */
@@ -779,6 +822,7 @@ struct sd_event *jobs_get_sd_event()
 	return result;
 }
 
+#if defined(REMOVE_SYSTEMD_EVENT)
 /**
  * Gets the fdev_epoll item.
  * @return a fdev_epoll or NULL in case of error
@@ -793,6 +837,7 @@ struct fdev_epoll *jobs_get_fdev_epoll()
 
 	return result;
 }
+#endif
 
 /**
  * Enter the jobs processing loop.
@@ -823,12 +868,6 @@ int jobs_start(int allowed_count, int start_count, int waiter_count, void (*star
 		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;