X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fjobs.c;h=a518766bfe772497bc97ae18e9ffa2a48c61502e;hb=6f13ad1989875b5a0ce50b24211fd1fba093735f;hp=417f7eac1fab792720c9e1a9acba6f1a19436ba1;hpb=e9c6530ee21bb3345741044e8bf87fc6a73252e9;p=src%2Fapp-framework-binder.git diff --git a/src/jobs.c b/src/jobs.c index 417f7eac..a518766b 100644 --- a/src/jobs.c +++ b/src/jobs.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017, 2018 "IoT.bzh" + * Copyright (C) 2016-2019 "IoT.bzh" * Author José Bollo * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -17,12 +17,6 @@ #define _GNU_SOURCE -#if defined(NO_JOBS_WATCHDOG) -# define HAS_WATCHDOG 0 -#else -# define HAS_WATCHDOG 1 -#endif - #include #include #include @@ -36,18 +30,12 @@ #include #include -#include "fdev.h" -#if HAS_WATCHDOG -#include -#endif #include "jobs.h" +#include "evmgr.h" #include "sig-monitor.h" #include "verbose.h" - -#if defined(REMOVE_SYSTEMD_EVENT) -#include "fdev-epoll.h" -#endif +#include "systemd.h" #define EVENT_TIMEOUT_TOP ((uint64_t)-1) #define EVENT_TIMEOUT_CHILD ((uint64_t)10000) @@ -69,19 +57,6 @@ struct job unsigned dropped: 1; /**< is removed ? */ }; -/** Description of handled event loops */ -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 */ -}; - -#define EVLOOP_STATE_WAIT 1U -#define EVLOOP_STATE_RUN 2U - /** Description of threads */ struct thread { @@ -93,6 +68,7 @@ struct thread pthread_t tid; /**< the thread id */ volatile unsigned stop: 1; /**< stop requested */ volatile unsigned waits: 1; /**< is waiting? */ + volatile unsigned leaved: 1; /**< was leaved? */ }; /** @@ -109,7 +85,6 @@ struct sync void *arg; /**< the argument of the callback */ }; - /* synchronisation of threads */ static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_cond_t cond = PTHREAD_COND_INITIALIZER; @@ -129,12 +104,9 @@ static struct job *first_job; static struct job *free_jobs; /* event loop */ -static struct evloop evloop; +static struct evmgr *evmgr; -#if defined(REMOVE_SYSTEMD_EVENT) -static struct fdev_epoll *fdevepoll; -static int waitevt; -#endif +static void (*exit_handler)(); /** * Create a new job with the given parameters @@ -162,6 +134,7 @@ static struct job *job_create( job = malloc(sizeof *job); pthread_mutex_lock(&mutex); if (!job) { + ERROR("out of memory"); errno = ENOMEM; goto end; } @@ -203,6 +176,7 @@ static void job_add(struct job *job) /* queue the jobs */ *pjob = job; + remains--; } /** @@ -214,6 +188,8 @@ static inline struct job *job_get() struct job *job = first_job; while (job && job->blocked) job = job->next; + if (job) + remains++; return job; } @@ -262,94 +238,21 @@ static inline void job_release(struct job *job) * flow, isn't used * @param arg the job to run */ +__attribute__((unused)) static void job_cancel(int signum, void *arg) { struct job *job = 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 - */ -static struct fdev_epoll *get_fdevepoll() -{ - struct fdev_epoll *result; - - result = fdevepoll; - if (!result) - result = fdevepoll = fdev_epoll_create(); - - return result; -} -#endif - -/** - * Monitored normal callback for events. - * This function is called by the monitor - * to run the event loop when the safe environment - * is set. - * @param signum 0 on normal flow or the number - * of the signal that interrupted the normal - * flow - * @param arg the events to run - */ -static void evloop_run(int signum, void *arg) -{ - int rc; - struct sd_event *se; - - if (!signum) { - se = evloop.sdev; - rc = sd_event_prepare(se); - if (rc < 0) { - errno = -rc; - 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); - if (rc < 0) { - errno = -rc; - ERROR("sd_event_wait returned an error (state: %d): %m", sd_event_get_state(se)); - } - } - evloop.state = EVLOOP_STATE_RUN; - if (rc > 0) { - rc = sd_event_dispatch(se); - if (rc < 0) { - errno = -rc; - ERROR("sd_event_dispatch returned an error (state: %d): %m", sd_event_get_state(se)); - } - } - } - } -} - -/** - * Internal callback for evloop management. - * The effect of this function is hidden: it exits - * the waiting poll if any. - */ -static void evloop_on_efd_event() -{ - uint64_t x; - read(evloop.efd, &x, sizeof x); -} - /** * wakeup the event loop if needed by sending * an event. */ static void evloop_wakeup() { - uint64_t x; - - if (evloop.state & EVLOOP_STATE_WAIT) { - x = 1; - write(evloop.efd, &x, sizeof x); - } + if (evmgr) + evmgr_wakeup(evmgr); } /** @@ -359,11 +262,13 @@ static void evloop_release() { struct thread *nh, *ct = current_thread; - if (evloop.holder == ct) { + if (ct && evmgr && evmgr_release_if(evmgr, ct)) { nh = ct->nholder; - evloop.holder = nh; - if (nh) + ct->nholder = 0; + if (nh) { + evmgr_try_hold(evmgr, nh); pthread_cond_signal(nh->cwhold); + } } } @@ -372,14 +277,7 @@ static void evloop_release() */ static int evloop_get() { - struct thread *ct = current_thread; - - if (evloop.holder) - return evloop.holder == ct; - - ct->nholder = NULL; - evloop.holder = ct; - return 1; + return evmgr && evmgr_try_hold(evmgr, current_thread); } /** @@ -387,7 +285,7 @@ static int evloop_get() */ static void evloop_acquire() { - struct thread **pwait, *ct; + struct thread *pwait, *ct; pthread_cond_t cond; /* try to get the evloop */ @@ -399,10 +297,10 @@ static void evloop_acquire() pthread_cond_init(&cond, NULL); /* queue current thread in holder list */ - pwait = &evloop.holder; - while (*pwait) - pwait = &(*pwait)->nholder; - *pwait = ct; + pwait = evmgr_holder(evmgr); + while (pwait->nholder) + pwait = pwait->nholder; + pwait->nholder = ct; /* wake up the evloop */ evloop_wakeup(); @@ -413,47 +311,56 @@ static void evloop_acquire() } } -#if defined(REMOVE_SYSTEMD_EVENT) /** - * Monitored normal loop for waiting events. - * @param signum 0 on normal flow or the number - * of the signal that interrupted the normal - * flow - * @param arg the events to run + * Enter the thread + * @param me the description of the thread to enter */ -static void monitored_wait_and_dispatch(int signum, void *arg) +static void thread_enter(volatile struct thread *me) { - struct fdev_epoll *fdev_epoll = arg; - if (!signum) { - fdev_epoll_wait_and_dispatch(fdev_epoll, -1); - } + evloop_release(); + /* initialize description of itself and link it in the list */ + me->tid = pthread_self(); + me->stop = 0; + me->waits = 0; + me->leaved = 0; + me->nholder = 0; + me->upper = current_thread; + me->next = threads; + threads = (struct thread*)me; + current_thread = (struct thread*)me; } -#endif /** - * Main processing loop of threads processing jobs. + * leave the thread + * @param me the description of the thread to leave + */ +static void thread_leave() +{ + struct thread **prv, *me; + + /* unlink the current thread and cleanup */ + me = current_thread; + prv = &threads; + while (*prv != me) + prv = &(*prv)->next; + *prv = me->next; + + current_thread = me->upper; +} + +/** + * Main processing loop of internal threads with processing jobs. * The loop must be called with the mutex locked * and it returns with the mutex locked. * @param me the description of the thread to use * TODO: how are timeout handled when reentering? */ -static void thread_run(volatile struct thread *me) +static void thread_run_internal(volatile struct thread *me) { - struct thread **prv; struct job *job; - /* initialize description of itself and link it in the list */ - me->tid = pthread_self(); - me->stop = 0; - me->waits = 0; - me->upper = current_thread; - if (!current_thread) { - started++; - sig_monitor_init_timeouts(); - } - me->next = threads; - threads = (struct thread*)me; - current_thread = (struct thread*)me; + /* enter thread */ + thread_enter(me); /* loop until stopped */ while (!me->stop) { @@ -464,7 +371,6 @@ static void thread_run(volatile struct thread *me) job = job_get(); if (job) { /* prepare running the job */ - remains++; /* increases count of job that can wait */ job->blocked = 1; /* mark job as blocked */ me->job = job; /* record the job (only for terminate) */ @@ -475,23 +381,18 @@ static void thread_run(volatile struct thread *me) /* release the run job */ job_release(job); -#if !defined(REMOVE_SYSTEMD_EVENT) - - - /* no job, check event loop wait */ } else if (evloop_get()) { - if (evloop.state != 0) { + if (!evmgr_can_run(evmgr)) { /* busy ? */ CRITICAL("Can't enter dispatch while in dispatch!"); abort(); } /* run the events */ - evloop.state = EVLOOP_STATE_RUN|EVLOOP_STATE_WAIT; + evmgr_prepare_run(evmgr); pthread_mutex_unlock(&mutex); - sig_monitor(0, evloop_run, NULL); + sig_monitor(0, (void(*)(int,void*))evmgr_job_run, evmgr); pthread_mutex_lock(&mutex); - evloop.state = 0; } else { /* no job and no event loop */ running--; @@ -501,55 +402,57 @@ static void thread_run(volatile struct thread *me) pthread_cond_wait(&cond, &mutex); me->waits = 0; running++; -#else - } else if (waitevt) { - /* 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 { - /* wait for events */ - waitevt = 1; - pthread_mutex_unlock(&mutex); - sig_monitor(0, monitored_wait_and_dispatch, get_fdevepoll()); - pthread_mutex_lock(&mutex); - waitevt = 0; -#endif } } - - /* release the event loop */ + /* cleanup */ evloop_release(); + thread_leave(); +} - /* unlink the current thread and cleanup */ - prv = &threads; - while (*prv != me) - prv = &(*prv)->next; - *prv = me->next; - current_thread = me->upper; - if (!current_thread) { - sig_monitor_clean_timeouts(); - started--; - } +/** + * Main processing loop of external threads. + * The loop must be called with the mutex locked + * and it returns with the mutex locked. + * @param me the description of the thread to use + */ +static void thread_run_external(volatile struct thread *me) +{ + /* enter thread */ + thread_enter(me); + + /* loop until stopped */ + me->waits = 1; + while (!me->stop) + pthread_cond_wait(&cond, &mutex); + me->waits = 0; + thread_leave(); } /** - * Entry point for created threads. - * @param data not used - * @return NULL + * Root for created threads. */ -static void *thread_main(void *data) +static void thread_main() { struct thread me; - pthread_mutex_lock(&mutex); running++; - thread_run(&me); + started++; + sig_monitor_init_timeouts(); + thread_run_internal(&me); + sig_monitor_clean_timeouts(); + started--; running--; +} + +/** + * Entry point for created threads. + * @param data not used + * @return NULL + */ +static void *thread_starter(void *data) +{ + pthread_mutex_lock(&mutex); + thread_main(); pthread_mutex_unlock(&mutex); return NULL; } @@ -563,7 +466,7 @@ static int start_one_thread() pthread_t tid; int rc; - rc = pthread_create(&tid, NULL, thread_main, NULL); + rc = pthread_create(&tid, NULL, thread_starter, NULL); if (rc != 0) { /* errno = rc; */ WARNING("not able to start thread: %m"); @@ -587,15 +490,16 @@ static int start_one_thread() * The remaining parameter is the parameter 'arg1' * given here. * @param arg The second argument for 'callback' + * @param start Allow to start a thread if not zero * @return 0 in case of success or -1 in case of error */ -int jobs_queue( +static int queue_job( const void *group, int timeout, void (*callback)(int, void*), - void *arg) + void *arg, + int start) { - const char *info; struct job *job; int rc; @@ -603,31 +507,27 @@ int jobs_queue( /* allocates the job */ job = job_create(group, timeout, callback, arg); - if (!job) { - errno = ENOMEM; - info = "out of memory"; + if (!job) goto error; - } /* check availability */ - if (remains == 0) { + if (remains <= 0) { + ERROR("can't process job with threads: too many jobs"); errno = EBUSY; - info = "too many jobs"; goto error2; } /* start a thread if needed */ - if (running == started && started < allowed) { + if (start && running == started && started < allowed) { /* all threads are busy and a new can be started */ rc = start_one_thread(); if (rc < 0 && started == 0) { - info = "can't start first thread"; + ERROR("can't start initial thread: %m"); goto error2; } } /* queues the job */ - remains--; job_add(job); /* signal an existing job */ @@ -639,11 +539,36 @@ error2: job->next = free_jobs; free_jobs = job; error: - ERROR("can't process job with threads: %s, %m", info); pthread_mutex_unlock(&mutex); return -1; } +/** + * Queues a new asynchronous job represented by 'callback' and 'arg' + * for the 'group' and the 'timeout'. + * Jobs are queued FIFO and are possibly executed in parallel + * concurrently except for job of the same group that are + * executed sequentially in FIFO order. + * @param group The group of the job or NULL when no group. + * @param timeout The maximum execution time in seconds of the job + * or 0 for unlimited time. + * @param callback The function to execute for achieving the job. + * Its first parameter is either 0 on normal flow + * or the signal number that broke the normal flow. + * The remaining parameter is the parameter 'arg1' + * given here. + * @param arg The second argument for 'callback' + * @return 0 in case of success or -1 in case of error + */ +int jobs_queue( + const void *group, + int timeout, + void (*callback)(int, void*), + void *arg) +{ + return queue_job(group, timeout, callback, arg, 1); +} + /** * Internal helper function for 'jobs_enter'. * @see jobs_enter, jobs_leave @@ -685,8 +610,6 @@ static int do_sync( /* allocates the job */ job = job_create(group, timeout, sync_cb, sync); if (!job) { - ERROR("out of memory"); - errno = ENOMEM; pthread_mutex_unlock(&mutex); return -1; } @@ -695,9 +618,15 @@ static int do_sync( job_add(job); /* run until stopped */ - thread_run(&sync->thread); + if (current_thread) + thread_run_internal(&sync->thread); + else + thread_run_external(&sync->thread); pthread_mutex_unlock(&mutex); - return 0; + if (sync->thread.leaved) + return 0; + errno = EINTR; + return -1; } /** @@ -745,6 +674,7 @@ int jobs_leave(struct jobloop *jobloop) if (!t) { errno = EINVAL; } else { + t->leaved = 1; t->stop = 1; if (t->waits) pthread_cond_broadcast(&cond); @@ -784,96 +714,10 @@ int jobs_call( } /** - * 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) -{ - evloop_on_efd_event(); - 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); -} - -/** - * Gets a sd_event item for the current thread. - * @return a sd_event or NULL in case of error + * Ensure that the current running thread can control the event loop. */ -static struct sd_event *get_sd_event_locked() +void jobs_acquire_event_manager() { - int rc; - - /* creates the evloop on need */ - if (!evloop.sdev) { - /* start the creation */ - evloop.state = 0; - /* creates the eventfd for waking up polls */ - evloop.efd = eventfd(0, EFD_CLOEXEC|EFD_SEMAPHORE); - if (evloop.efd < 0) { - ERROR("can't make eventfd for events"); - goto error1; - } - /* create the systemd event loop */ - rc = sd_event_new(&evloop.sdev); - if (rc < 0) { - ERROR("can't make new event loop"); - goto error2; - } - /* put the eventfd in the event loop */ - rc = sd_event_add_io(evloop.sdev, NULL, evloop.efd, EPOLLIN, on_evloop_efd, NULL); - if (rc < 0) { - ERROR("can't register eventfd"); -#if !defined(REMOVE_SYSTEMD_EVENT) - sd_event_unref(evloop.sdev); - evloop.sdev = NULL; -error2: - close(evloop.efd); -error1: - return NULL; - } -#else - goto error3; - } - /* handle the event loop */ - evloop.fdev = fdev_epoll_add(get_fdevepoll(), sd_event_get_fd(evloop.sdev)); - if (!evloop.fdev) { - ERROR("can't create fdev"); -error3: - sd_event_unref(evloop.sdev); -error2: - close(evloop.efd); -error1: - memset(&evloop, 0, sizeof evloop); - return NULL; - } - fdev_set_autoclose(evloop.fdev, 0); - fdev_set_events(evloop.fdev, EPOLLIN); - fdev_set_callback(evloop.fdev, evloop_callback, NULL); -#endif - } - - /* acquire the event loop */ - evloop_acquire(); - - return evloop.sdev; -} - -/** - * Gets a sd_event item for the current thread. - * @return a sd_event or NULL in case of error - */ -struct sd_event *jobs_get_sd_event() -{ - struct sd_event *result; struct thread lt; /* ensure an existing thread environment */ @@ -882,9 +726,18 @@ struct sd_event *jobs_get_sd_event() current_thread = < } - /* process */ + /* lock */ pthread_mutex_lock(&mutex); - result = get_sd_event_locked(); + + /* creates the evloop on need */ + if (!evmgr) + evmgr_create(&evmgr); + + /* acquire the event loop under lock */ + if (evmgr) + evloop_acquire(); + + /* unlock */ pthread_mutex_unlock(&mutex); /* release the faked thread environment if needed */ @@ -897,33 +750,14 @@ struct sd_event *jobs_get_sd_event() * A workaround to achieve that goal is for the caller to * require the event loop a second time after having modified it. */ - NOTICE("Requiring sd_event loop out of binder callbacks is hazardous!"); + NOTICE("Requiring event manager/loop from outside of binder's callback is hazardous!"); if (verbose_wants(Log_Level_Info)) sig_monitor_dumpstack(); evloop_release(); current_thread = NULL; } - - return result; } -#if defined(REMOVE_SYSTEMD_EVENT) -/** - * Gets the fdev_epoll item. - * @return a fdev_epoll or NULL in case of error - */ -struct fdev_epoll *jobs_get_fdev_epoll() -{ - struct fdev_epoll *result; - - pthread_mutex_lock(&mutex); - result = get_fdevepoll(); - pthread_mutex_unlock(&mutex); - - return result; -} -#endif - /** * Enter the jobs processing loop. * @param allowed_count Maximum count of thread for jobs including this one @@ -935,7 +769,6 @@ struct fdev_epoll *jobs_get_fdev_epoll() int jobs_start(int allowed_count, int start_count, int waiter_count, void (*start)(int signum, void* arg), void *arg) { int rc, launched; - struct thread me; struct job *job; assert(allowed_count >= 1); @@ -959,15 +792,9 @@ 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 */ - launched = 0; - while ((launched + 1) < start_count) { + /* start at least one thread: the current one */ + launched = 1; + while (launched < start_count) { if (start_one_thread() != 0) { ERROR("Not all threads can be started"); goto error; @@ -977,59 +804,32 @@ int jobs_start(int allowed_count, int start_count, int waiter_count, void (*star /* queue the start job */ job = job_create(NULL, 0, start, arg); - if (!job) { - ERROR("out of memory"); - errno = ENOMEM; + if (!job) goto error; - } job_add(job); - remains--; /* run until end */ - running++; - thread_run(&me); - running--; + thread_main(); rc = 0; error: pthread_mutex_unlock(&mutex); + if (exit_handler) + exit_handler(); return rc; } /** - * Terminate all the threads and cancel all pending jobs. + * Exit jobs threads and call handler if not NULL. */ -void jobs_terminate() +void jobs_exit(void (*handler)()) { - struct job *job, *head, *tail; - pthread_t me, *others; struct thread *t; - int count; - - /* how am i? */ - me = pthread_self(); /* request all threads to stop */ pthread_mutex_lock(&mutex); - allowed = 0; - /* count the number of threads */ - count = 0; - t = threads; - while (t) { - if (!t->upper && !pthread_equal(t->tid, me)) - count++; - t = t->next; - } - - /* fill the array of threads */ - others = alloca(count * sizeof *others); - count = 0; - t = threads; - while (t) { - if (!t->upper && !pthread_equal(t->tid, me)) - others[count++] = t->tid; - t = t->next; - } + /* set the handler */ + exit_handler = handler; /* stops the threads */ t = threads; @@ -1040,41 +840,7 @@ void jobs_terminate() /* wait the threads */ pthread_cond_broadcast(&cond); - pthread_mutex_unlock(&mutex); - while (count) - pthread_join(others[--count], NULL); - pthread_mutex_lock(&mutex); - /* cancel pending jobs of other threads */ - remains = 0; - head = first_job; - first_job = NULL; - tail = NULL; - while (head) { - /* unlink the job */ - job = head; - head = job->next; - - /* search if job is stacked for current */ - t = current_thread; - while (t && t->job != job) - t = t->upper; - if (t) { - /* yes, relink it at end */ - if (tail) - tail->next = job; - else - first_job = job; - tail = job; - job->next = NULL; - } else { - /* no cancel the job */ - pthread_mutex_unlock(&mutex); - sig_monitor(0, job_cancel, job); - free(job); - pthread_mutex_lock(&mutex); - } - } + /* leave */ pthread_mutex_unlock(&mutex); } -