X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fjobs.c;h=f2c9d52be375cf756ab904b4debce1e08db53f4b;hb=e84fc44c47b42651fef17405f5bc09e5079d4a72;hp=26fc01571dba753a0165dc28299ef62c31c41512;hpb=4521c1e7ae5371ab9d639adc617d17fb4e8ded0c;p=src%2Fapp-framework-binder.git

diff --git a/src/jobs.c b/src/jobs.c
index 26fc0157..f2c9d52b 100644
--- a/src/jobs.c
+++ b/src/jobs.c
@@ -44,17 +44,16 @@
 #include "jobs.h"
 #include "sig-monitor.h"
 #include "verbose.h"
+
+#if defined(REMOVE_SYSTEMD_EVENT)
 #include "fdev-epoll.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))
 #endif
 
 #define EVENT_TIMEOUT_TOP  	((uint64_t)-1)
 #define EVENT_TIMEOUT_CHILD	((uint64_t)10000)
 
+struct thread;
+
 /** Internal shortcut for callback */
 typedef void (*job_cb_t)(int, void*);
 
@@ -78,6 +77,7 @@ struct evloop
 	struct sd_event *sdev; /**< the systemd event loop */
 	pthread_cond_t  cond;  /**< condition */
 	struct fdev *fdev;     /**< handling of events */
+	struct thread *holder; /**< holder of the evloop */
 };
 
 #define EVLOOP_STATE_WAIT           1U
@@ -131,11 +131,11 @@ static struct job *free_jobs;
 
 /* event loop */
 static struct evloop evloop[1];
+
+#if defined(REMOVE_SYSTEMD_EVENT)
 static struct fdev_epoll *fdevepoll;
-#if !defined(REMOVE_SYSTEMD_EVENT)
-__attribute__((unused))
-#endif
 static int waitevt;
+#endif
 
 /**
  * Create a new job with the given parameters
@@ -163,7 +163,7 @@ static struct job *job_create(
 		job = malloc(sizeof *job);
 		pthread_mutex_lock(&mutex);
 		if (!job) {
-			errno = -ENOMEM;
+			errno = ENOMEM;
 			goto end;
 		}
 	}
@@ -269,6 +269,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
@@ -283,6 +284,7 @@ static struct fdev_epoll *get_fdevepoll()
 
 	return result;
 }
+#endif
 
 /**
  * Monitored normal callback for events.
@@ -303,11 +305,13 @@ static void evloop_run(int signum, void *arg)
 	if (!signum) {
 		current_evloop = el;
 		__atomic_store_n(&el->state, EVLOOP_STATE_LOCK|EVLOOP_STATE_RUN|EVLOOP_STATE_WAIT, __ATOMIC_RELAXED);
+		__atomic_store_n(&el->holder, current_thread, __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);
@@ -331,6 +335,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
@@ -338,9 +343,6 @@ static void evloop_run(int signum, void *arg)
  *               flow
  * @param arg     the events to run
  */
-#if !defined(REMOVE_SYSTEMD_EVENT)
-__attribute__((unused))
-#endif
 static void monitored_wait_and_dispatch(int signum, void *arg)
 {
 	struct fdev_epoll *fdev_epoll = arg;
@@ -348,6 +350,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.
@@ -382,6 +385,7 @@ static void thread_run(volatile struct thread *me)
 		/* release the event loop */
 		if (current_evloop) {
 			__atomic_and_fetch(&current_evloop->state, ~EVLOOP_STATE_LOCK, __ATOMIC_RELAXED);
+			__atomic_store_n(&current_evloop->holder, NULL, __ATOMIC_RELAXED);
 			current_evloop = NULL;
 		}
 
@@ -407,6 +411,7 @@ static void thread_run(volatile struct thread *me)
 			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);
+				__atomic_store_n(&el->holder, me, __ATOMIC_RELAXED);
 				current_evloop = el;
 				pthread_mutex_unlock(&mutex);
 				sig_monitor(0, evloop_run, el);
@@ -445,6 +450,7 @@ static void thread_run(volatile struct thread *me)
 	/* release the event loop */
 	if (current_evloop) {
 		__atomic_and_fetch(&current_evloop->state, ~EVLOOP_STATE_LOCK, __ATOMIC_RELAXED);
+		__atomic_store_n(&el->holder, NULL, __ATOMIC_RELAXED);
 		current_evloop = NULL;
 	}
 
@@ -652,6 +658,41 @@ int jobs_enter(
 	return do_sync(group, timeout, enter_cb, &sync);
 }
 
+/**
+ * Internal callback for evloop management.
+ * The effect of this function is hidden: it exits
+ * the waiting poll if any. Then it wakes up a thread
+ * awaiting the evloop using signal.
+ */
+static int on_evloop_efd(sd_event_source *s, int fd, uint32_t revents, void *userdata)
+{
+	uint64_t x;
+	struct evloop *evloop = userdata;
+	read(evloop->efd, &x, sizeof x);
+	pthread_mutex_lock(&mutex);
+	pthread_cond_broadcast(&evloop->cond);
+	pthread_mutex_unlock(&mutex);
+	return 1;
+}
+
+/**
+ * unlock the event loop if needed by sending
+ * an event.
+ * @param el the event loop to unlock
+ * @param wait wait the unlocked state of the event loop
+ */
+static void unlock_evloop(struct evloop *el, int wait)
+{
+	/* wait for a modifiable event loop */
+	while (__atomic_load_n(&el->state, __ATOMIC_RELAXED) & EVLOOP_STATE_WAIT) {
+		uint64_t x = 1;
+		write(el->efd, &x, sizeof x);
+		if (!wait)
+			break;
+		pthread_cond_wait(&el->cond, &mutex);
+	}
+}
+
 /**
  * Unlocks the execution flow designed by 'jobloop'.
  * @param jobloop indication of the flow to unlock
@@ -660,6 +701,7 @@ int jobs_enter(
 int jobs_leave(struct jobloop *jobloop)
 {
 	struct thread *t;
+	int i;
 
 	pthread_mutex_lock(&mutex);
 	t = threads;
@@ -671,6 +713,15 @@ int jobs_leave(struct jobloop *jobloop)
 		t->stop = 1;
 		if (t->waits)
 			pthread_cond_broadcast(&cond);
+		else {
+			i = (int)(sizeof evloop / sizeof *evloop);
+			while(i) {
+				if (evloop[--i].holder == t) {
+					unlock_evloop(&evloop[i], 0);
+					break;
+				}
+			}
+		}
 	}
 	pthread_mutex_unlock(&mutex);
 	return -!t;
@@ -704,23 +755,6 @@ int jobs_call(
 	return do_sync(group, timeout, call_cb, &sync);
 }
 
-/**
- * Internal callback for evloop management.
- * The effect of this function is hidden: it exits
- * the waiting poll if any. Then it wakes up a thread
- * awaiting the evloop using signal.
- */
-static int on_evloop_efd(sd_event_source *s, int fd, uint32_t revents, void *userdata)
-{
-	uint64_t x;
-	struct evloop *evloop = userdata;
-	read(evloop->efd, &x, sizeof x);
-	pthread_mutex_lock(&mutex);
-	pthread_cond_broadcast(&evloop->cond);
-	pthread_mutex_unlock(&mutex);
-	return 1;
-}
-
 /* temporary hack */
 #if !defined(REMOVE_SYSTEMD_EVENT)
 __attribute__((unused))
@@ -737,7 +771,6 @@ static void evloop_callback(void *arg, uint32_t event, struct fdev *fdev)
 static struct sd_event *get_sd_event_locked()
 {
 	struct evloop *el;
-	uint64_t x;
 	int rc;
 
 	/* creates the evloop on need */
@@ -792,18 +825,17 @@ error1:
 
 	/* attach the event loop to the current thread */
 	if (current_evloop != el) {
-		if (current_evloop)
+		if (current_evloop) {
 			__atomic_and_fetch(&current_evloop->state, ~EVLOOP_STATE_LOCK, __ATOMIC_RELAXED);
+			__atomic_store_n(&current_evloop->holder, NULL, __ATOMIC_RELAXED);
+		}
 		current_evloop = el;
 		__atomic_or_fetch(&el->state, EVLOOP_STATE_LOCK, __ATOMIC_RELAXED);
+		__atomic_store_n(&el->holder, current_thread, __ATOMIC_RELAXED);
 	}
 
 	/* wait for a modifiable event loop */
-	while (__atomic_load_n(&el->state, __ATOMIC_RELAXED) & EVLOOP_STATE_WAIT) {
-		x = 1;
-		write(el->efd, &x, sizeof x);
-		pthread_cond_wait(&el->cond, &mutex);
-	}
+	unlock_evloop(el, 1);
 
 	return el->sdev;
 }
@@ -823,6 +855,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
@@ -837,6 +870,7 @@ struct fdev_epoll *jobs_get_fdev_epoll()
 
 	return result;
 }
+#endif
 
 /**
  * Enter the jobs processing loop.
@@ -867,12 +901,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;
@@ -906,7 +934,9 @@ int jobs_start(int allowed_count, int start_count, int waiter_count, void (*star
 	remains--;
 
 	/* run until end */
+	running++;
 	thread_run(&me);
+	running--;
 	rc = 0;
 error:
 	pthread_mutex_unlock(&mutex);