jobs: optimized version of fix starve

[src/app-framework-binder.git] / src / jobs.c

diff --git a/src/jobs.c b/src/jobs.c
index 1e84c82..ed812f8 100644 (file)
--- a/src/jobs.c
+++ b/src/jobs.c
@@ -64,6 +64,7 @@ struct events
        struct events *next;
        struct sd_event *event;
        uint64_t timeout;
+       unsigned used: 1;
        unsigned runs: 1;
 };
 
@@ -203,7 +204,7 @@ static inline struct job *job_get()
 static inline struct events *events_get()
 {
        struct events *events = first_events;
-       while (events && events->runs)
+       while (events && events->used)
                events = events->next;
        return events;
 }
@@ -285,7 +286,7 @@ static void events_call(int signum, void *arg)
  */
 static void thread_run(volatile struct thread *me)
 {
-       struct thread **prv;
+       struct thread **prv, *thr;
        struct job *job;
        struct events *events;
        uint64_t evto;
@@ -299,17 +300,18 @@ static void thread_run(volatile struct thread *me)
        if (current) {
                current->lowered = 1;
                evto = EVENT_TIMEOUT_CHILD;
+               me->events = current->events;
        } else {
                started++;
                sig_monitor_init_timeouts();
                evto = EVENT_TIMEOUT_TOP;
+               me->events = NULL;
        }
        me->next = threads;
        threads = (struct thread*)me;
        current = (struct thread*)me;
 
        /* loop until stopped */
-       me->events = NULL;
        while (!me->stop) {
                /* get a job */
                job = job_get(first_job);
@@ -330,22 +332,31 @@ static void thread_run(volatile struct thread *me)
                        /* release event if any */
                        events = me->events;
                        if (events) {
-                               events->runs = 0;
+                               events->used = 0;
                                me->events = NULL;
                        }
                } else {
                        /* no job, check events */
-                       events = events_get();
+                       events = me->events;
+                       if (!events || events->runs)
+                               events = events_get();
                        if (events) {
                                /* run the events */
+                               events->used = 1;
                                events->runs = 1;
                                events->timeout = evto;
                                me->events = events;
                                pthread_mutex_unlock(&mutex);
                                sig_monitor(0, events_call, events);
                                pthread_mutex_lock(&mutex);
+                               events->used = 0;
                                events->runs = 0;
                                me->events = NULL;
+                               thr = me->upper;
+                               while (thr && thr->events == events) {
+                                       thr->events = NULL;
+                                       thr = thr->upper;
+                               }
                        } else {
                                /* no job and not events */
                                waiting++;
@@ -644,6 +655,7 @@ struct sd_event *jobs_get_sd_event()
                                events = malloc(sizeof *events);
                                if (events && (rc = sd_event_new(&events->event)) >= 0) {
                                        if (nevents < started || start_one_thread() >= 0) {
+                                               events->used = 0;
                                                events->runs = 0;
                                                events->next = first_events;
                                                first_events = events;
@@ -667,10 +679,9 @@ struct sd_event *jobs_get_sd_event()
                        }
                }
                if (events) {
-                       /* */
                        me = current;
                        if (me) {
-                               events->runs = 1;
+                               events->used = 1;
                                me->events = events;
                        } else {
                                WARNING("event returned for unknown thread!");