jobs: Fix infinite wait lock

The binder was sometime locked until an external
event comes. This was discovered during stressing
startup test that don't expect external inputs and
that then waits for always without terminating.

The issue came from a little hole in the management
of the state of evmgr object. By design the evmgr
has to be synchronised against concurrent accesses
not by itself but by the integration. However, the
state of "running" wasn't set in the code protected
against concurent accesses. The new function allows
the integrator to correctly set the state before
releasing protection.

Bug-AGL: SPEC-2459

Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Change-Id: Id75fd97c06d69666ced912a0a61380573dab31af

diff --git a/src/evmgr.c b/src/evmgr.c
index 557a9f3..744d08b 100644 (file)
--- a/src/evmgr.c
+++ b/src/evmgr.c
@@ -47,6 +47,14 @@ struct evmgr
 #define EVLOOP_STATE_WAIT           1U
 #define EVLOOP_STATE_RUN            2U
 
+/**
+ * prepare the evmgr to run
+ */
+void evmgr_prepare_run(struct evmgr *evmgr)
+{
+       evmgr->state = EVLOOP_STATE_WAIT|EVLOOP_STATE_RUN;
+}
+
 /**
  * Run the event loop is set.
  */

diff --git a/src/evmgr.h b/src/evmgr.h
index c78ea33..2dde16b 100644 (file)
--- a/src/evmgr.h
+++ b/src/evmgr.h
@@ -20,6 +20,7 @@
 
 struct evmgr;
 
+extern void evmgr_prepare_run(struct evmgr *evmgr);
 extern void evmgr_run(struct evmgr *evmgr);
 extern void evmgr_job_run(int signum, struct evmgr *evmgr);
 extern int evmgr_can_run(struct evmgr *evmgr);

diff --git a/src/jobs.c b/src/jobs.c
index 936c6f1..a518766 100644 (file)
--- a/src/jobs.c
+++ b/src/jobs.c
@@ -389,6 +389,7 @@ static void thread_run_internal(volatile struct thread *me)
                                abort();
                        }
                        /* run the events */
+                       evmgr_prepare_run(evmgr);
                        pthread_mutex_unlock(&mutex);
                        sig_monitor(0, (void(*)(int,void*))evmgr_job_run, evmgr);
                        pthread_mutex_lock(&mutex);