#include "sig-monitor.h"
#include "verbose.h"
-/** control of threads */
-struct thread
+#if 0
+#define _alert_ "do you really want to remove 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
+
+/** Internal shortcut for callback */
+typedef void (*job_cb_t)(int, void*, void *, void*);
+
+/** Description of a pending job */
+struct job
{
- struct thread *next; /**< next thread of the list */
- pthread_t tid; /**< the thread id */
- unsigned stop: 1; /**< stop request */
+ struct job *next; /**< link to the next job enqueued */
+ void *group; /**< group of the request */
+ job_cb_t callback; /**< processing callback */
+ void *arg1; /**< first arg */
+ void *arg2; /**< second arg */
+ void *arg3; /**< third arg */
+ int timeout; /**< timeout in second for processing the request */
+ unsigned blocked: 1; /**< is an other request blocking this one ? */
+ unsigned dropped: 1; /**< is removed ? */
};
-/* describes pending job */
-struct job
+/** Description of threads */
+struct thread
{
- struct job *next; /* link to the next job enqueued */
- void *group; /* group of the request */
- void (*callback)(int,void*,void*,void*); /* processing callback */
- void *arg1; /* first arg */
- void *arg2; /* second arg */
- void *arg3; /* second arg */
- int timeout; /* timeout in second for processing the request */
- int blocked; /* is an other request blocking this one ? */
+ struct thread *next; /**< next thread of the list */
+ struct thread *upper; /**< upper same thread */
+ struct job *job; /**< currently processed job */
+ pthread_t tid; /**< the thread id */
+ unsigned stop: 1; /**< stop requested */
+ unsigned lowered: 1; /**< has a lower same thread */
+ unsigned waits: 1; /**< is waiting? */
};
/* synchronisation of threads */
static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
static pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
-/* count allowed, started and running threads */
+/* count allowed, started and waiting threads */
static int allowed = 0; /** allowed count of threads */
static int started = 0; /** started count of threads */
-static int running = 0; /** running count of threads */
-static int remains = 0; /** remaining count of jobs that can be created */
+static int waiting = 0; /** waiting count of threads */
+static int remains = 0; /** allowed count of waiting jobs */
/* list of threads */
static struct thread *threads;
+static _Thread_local struct thread *current;
/* queue of pending jobs */
static struct job *first_job;
-static struct job *first_evloop;
+static struct job *first_events;
static struct job *free_jobs;
/**
- * Adds the 'job' at the end of the list of jobs, marking it
- * as blocked if an other job with the same group is pending.
- * @param job the job to add
- */
-static inline void job_add(struct job *job)
-{
- void *group;
- struct job *ijob, **pjob;
-
- pjob = &first_job;
- ijob = first_job;
- group = job->group ? : (void*)(intptr_t)1;
- while (ijob) {
- if (ijob->group == group)
- job->blocked = 1;
- pjob = &ijob->next;
- ijob = ijob->next;
- }
- job->next = NULL;
- *pjob = job;
- remains--;
-}
-
-/**
- * Get the next job to process or NULL if none.
- * The returned job if any is removed from the list of
- * jobs.
- * @return the job to process
- */
-static inline struct job *job_get()
-{
- struct job *job, **pjob;
-
- pjob = &first_job;
- job = first_job;
- while (job && job->blocked) {
- pjob = &job->next;
- job = job->next;
- }
- if (job) {
- *pjob = job->next;
- remains++;
- }
- return job;
-}
-
-/**
- * Unblock the first pending job of a group (if any)
- * @param group the group to unblock
+ * Create a new job with the given parameters
+ * @param group the group of the job
+ * @param timeout the timeout of the job (0 if none)
+ * @param callback the function that achieves the job
+ * @param arg1 the first argument of the callback
+ * @param arg2 the second argument of the callback
+ * @param arg3 the third argument of the callback
+ * @return the created job unblock or NULL when no more memory
*/
-static inline void job_unblock(void *group)
-{
- struct job *job;
-
- job = first_job;
- while (job) {
- if (job->group == group) {
- job->blocked = 0;
- break;
- }
- job = job->next;
- }
-}
-
static struct job *job_create(
void *group,
int timeout,
- void (*callback)(int, void*, void *, void*),
+ job_cb_t callback,
void *arg1,
void *arg2,
void *arg3)
{
struct job *job;
- /* allocates the job */
+ /* try recyle existing job */
job = free_jobs;
if (job)
free_jobs = job->next;
else {
+ /* allocation without blocking */
pthread_mutex_unlock(&mutex);
job = malloc(sizeof *job);
pthread_mutex_lock(&mutex);
goto end;
}
}
+ /* initialises the job */
job->group = group;
job->timeout = timeout;
job->callback = callback;
job->arg2 = arg2;
job->arg3 = arg3;
job->blocked = 0;
+ job->dropped = 0;
end:
return job;
}
-static inline void job_destroy(struct job *job)
+/**
+ * Adds 'job1' and 'job2' at the end of the list of jobs, marking it
+ * as blocked if an other job with the same group is pending.
+ * @param job1 the first job to add
+ * @param job2 the second job to add or NULL
+ */
+static void job_add2(struct job *job1, struct job *job2)
{
+ void *group1, *group2, *group;
+ struct job *ijob, **pjob;
+
+ /* prepare to add */
+ group1 = job1->group;
+ job1->next = job2;
+ if (!job2)
+ group2 = NULL;
+ else {
+ job2->next = NULL;
+ group2 = job2->group;
+ if (group2 && group2 == group1)
+ job2->blocked = 1;
+ }
+
+ /* search end and blockers */
+ pjob = &first_job;
+ ijob = first_job;
+ while (ijob) {
+ group = ijob->group;
+ if (group) {
+ if (group == group1)
+ job1->blocked = 1;
+ if (group == group2)
+ job2->blocked = 1;
+ }
+ pjob = &ijob->next;
+ ijob = ijob->next;
+ }
+
+ /* queue the jobs */
+ *pjob = job1;
+}
+
+/**
+ * Get the next job to process or NULL if none.
+ * @param job the head of the list to search.
+ * @return the first job that isn't blocked or NULL
+ */
+static inline struct job *job_get(struct job *job)
+{
+ while (job && job->blocked)
+ job = job->next;
+ return job;
+}
+
+/**
+ * Releases the processed 'job': removes it
+ * from the list of jobs and unblock the first
+ * pending job of the same group if any.
+ * @param job the job to release
+ */
+static inline void job_release(struct job *job)
+{
+ struct job *ijob, **pjob;
+ void *group;
+
+ /* first unqueue the job */
+ pjob = &first_job;
+ ijob = first_job;
+ while (ijob != job) {
+ pjob = &ijob->next;
+ ijob = ijob->next;
+ }
+ *pjob = job->next;
+
+ /* then unblock jobs of the same group */
+ group = job->group;
+ if (group) {
+ ijob = job->next;
+ while (ijob && ijob->group != group)
+ ijob = ijob->next;
+ if (ijob)
+ ijob->blocked = 0;
+ }
+
+ /* recycle the job */
job->next = free_jobs;
free_jobs = job;
}
-static inline void job_release(struct job *job)
+/**
+ * Releases the events 'job': removes it
+ * from the list of events.
+ * @param job the event to release
+ */
+static inline void events_release(struct job *job)
{
- if (job->group)
- job_unblock(job->group);
- job_destroy(job);
+ struct job *ijob, **pjob;
+
+ /* first unqueue the job */
+ pjob = &first_events;
+ ijob = first_events;
+ while (ijob != job) {
+ pjob = &ijob->next;
+ ijob = ijob->next;
+ }
+ *pjob = job->next;
+
+ /* recycle the job */
+ job->next = free_jobs;
+ free_jobs = job;
+}
+
+/**
+ * Get the events of 'key' if existing.
+ * @param key the key to search
+ * @return the found events or NULL if none existing has key
+ */
+static inline struct job *events_of_key(void *key)
+{
+ struct job *job;
+
+ if (!key)
+ job = NULL;
+ else {
+ job = first_events;
+ while (job && (job->dropped || job->group != key))
+ job = job->next;
+ }
+ return job;
}
-/** monitored call to the job */
+/**
+ * Monitored normal callback for a job.
+ * This function is called by the monitor
+ * to run the job 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 job to run
+ */
static void job_call(int signum, void *arg)
{
struct job *job = arg;
job->callback(signum, job->arg1, job->arg2, job->arg3);
}
-/** monitored cancel of the job */
+/**
+ * Monitored cancel callback for a job.
+ * This function is called by the monitor
+ * to cancel the job when the safe environment
+ * is set.
+ * @param signum 0 on normal flow or the number
+ * of the signal that interrupted the normal
+ * flow, isn't used
+ * @param arg the job to run
+ */
static void job_cancel(int signum, void *arg)
{
job_call(SIGABRT, arg);
}
-/* main loop of processing threads */
-static void *thread_main_loop(void *data)
+/**
+ * Main processing loop of threads 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(struct thread *me)
{
- struct thread me, **prv;
+ struct thread **prv;
struct job *job;
- /* init */
- me.tid = pthread_self();
- me.stop = 0;
- sig_monitor_init_timeouts();
-
- /* chain in */
- pthread_mutex_lock(&mutex);
- me.next = threads;
- threads = &me;
+ /* initialize description of itself and link it in the list */
+ me->tid = pthread_self();
+ me->stop = 0;
+ me->lowered = 0;
+ me->waits = 0;
+ me->upper = current;
+ if (current)
+ current->lowered = 1;
+ else
+ sig_monitor_init_timeouts();
+ current = me;
+ me->next = threads;
+ threads = me;
+ started++;
/* loop until stopped */
- running++;
- while (!me.stop) {
+ while (!me->stop) {
/* get a job */
- job = job_get();
- if (!job && first_job && running == 0) {
- /* sad situation!! should not happen */
- ERROR("threads are blocked!");
- job = first_job;
- first_job = job->next;
- }
+ job = job_get(first_job);
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) */
+
/* run the job */
pthread_mutex_unlock(&mutex);
sig_monitor(job->timeout, job_call, job);
pthread_mutex_lock(&mutex);
+
+ /* release the run job */
job_release(job);
} else {
- /* no job, check evloop */
- job = first_evloop;
+ /* no job, check events */
+ job = job_get(first_events);
if (job) {
- /* evloop */
- first_evloop = job->next;
+ /* run the events */
+ job->blocked = 1;
pthread_mutex_unlock(&mutex);
sig_monitor(job->timeout, job_call, job);
pthread_mutex_lock(&mutex);
- job->next = first_evloop;
- first_evloop = job;
+ job->blocked = 0;
+ if (job->dropped)
+ events_release(job);
} else {
- /* no job and not evloop */
- running--;
+ /* no job and not events */
+ waiting++;
+ me->waits = 1;
pthread_cond_wait(&cond, &mutex);
- running++;
+ me->waits = 0;
+ waiting--;
}
}
}
- running--;
- /* chain out */
+ /* unlink the current thread and cleanup */
+ started--;
prv = &threads;
- while (*prv != &me)
+ while (*prv != me)
prv = &(*prv)->next;
- *prv = me.next;
- pthread_mutex_unlock(&mutex);
+ *prv = me->next;
+ current = me->upper;
+ if (current)
+ current->lowered = 0;
+ else
+ sig_monitor_clean_timeouts();
+}
+
+/**
+ * Entry point for created threads.
+ * @param data not used
+ * @return NULL
+ */
+static void *thread_main(void *data)
+{
+ struct thread me;
- /* uninit and terminate */
- sig_monitor_clean_timeouts();
+ pthread_mutex_lock(&mutex);
+ thread_run(&me);
+ pthread_mutex_unlock(&mutex);
return NULL;
}
-/* start a new thread */
+/**
+ * Starts a new thread
+ * @return 0 in case of success or -1 in case of error
+ */
static int start_one_thread()
{
pthread_t tid;
int rc;
- assert(started < allowed);
-
- started++;
- rc = pthread_create(&tid, NULL, thread_main_loop, NULL);
+ rc = pthread_create(&tid, NULL, thread_main, NULL);
if (rc != 0) {
- started--;
- errno = rc;
+ /* errno = rc; */
WARNING("not able to start thread: %m");
rc = -1;
}
return rc;
}
+/**
+ * Queues a new asynchronous job represented by 'callback'
+ * 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.
+ * @return 0 in case of success or -1 in case of error
+ */
+int jobs_queue0(
+ void *group,
+ int timeout,
+ void (*callback)(int signum))
+{
+ return jobs_queue3(group, timeout, (job_cb_t)callback, NULL, NULL, NULL);
+}
+
+/**
+ * Queues a new asynchronous job represented by 'callback' and 'arg1'
+ * 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 arg1 The second argument for 'callback'
+ * @return 0 in case of success or -1 in case of error
+ */
int jobs_queue(
void *group,
int timeout,
void (*callback)(int, void*),
void *arg)
{
- return jobs_queue3(group, timeout, (void(*)(int,void*,void*,void*))callback, arg, NULL, NULL);
+ return jobs_queue3(group, timeout, (job_cb_t)callback, arg, NULL, NULL);
}
+/**
+ * Queues a new asynchronous job represented by 'callback' and 'arg[12]'
+ * 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 parameters are the parameters 'arg[12]'
+ * given here.
+ * @param arg1 The second argument for 'callback'
+ * @param arg2 The third argument for 'callback'
+ * @return 0 in case of success or -1 in case of error
+ */
int jobs_queue2(
void *group,
int timeout,
void *arg1,
void *arg2)
{
- return jobs_queue3(group, timeout, (void(*)(int,void*,void*,void*))callback, arg1, arg2, NULL);
+ return jobs_queue3(group, timeout, (job_cb_t)callback, arg1, arg2, NULL);
}
-/* queue the job to the 'callback' using a separate thread if available */
+/**
+ * Queues a new asynchronous job represented by 'callback' and 'arg[123]'
+ * 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 parameters are the parameters 'arg[123]'
+ * given here.
+ * @param arg1 The second argument for 'callback'
+ * @param arg2 The third argument for 'callback'
+ * @param arg3 The forth argument for 'callback'
+ * @return 0 in case of success or -1 in case of error
+ */
int jobs_queue3(
void *group,
int timeout,
goto error;
}
- /* start a thread if needed */
+ /* check availability */
if (remains == 0) {
errno = EBUSY;
info = "too many jobs";
goto error2;
}
- if (started == running && started < allowed) {
+
+ /* start a thread if needed */
+ if (waiting == 0 && started < allowed) {
+ /* all threads are busy and a new can be started */
rc = start_one_thread();
if (rc < 0 && started == 0) {
- /* failed to start threading */
info = "can't start first thread";
goto error2;
}
}
/* queues the job */
- job_add(job);
- pthread_mutex_unlock(&mutex);
+ remains--;
+ job_add2(job, NULL);
/* signal an existing job */
pthread_cond_signal(&cond);
+ pthread_mutex_unlock(&mutex);
return 0;
error2:
- job_destroy(job);
+ job->next = free_jobs;
+ free_jobs = job;
error:
ERROR("can't process job with threads: %s, %m", info);
pthread_mutex_unlock(&mutex);
return -1;
}
-/* initialise the threads */
+/**
+ * Run a asynchronous job represented by 'callback'
+ * with the 'timeout' but only returns after job completion.
+ * @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.
+ * @return 0 in case of success or -1 in case of error
+ */
+int jobs_invoke0(
+ int timeout,
+ void (*callback)(int signum))
+{
+ return jobs_invoke3(timeout, (job_cb_t)callback, NULL, NULL, NULL);
+}
+
+/**
+ * Run a asynchronous job represented by 'callback' and 'arg1'
+ * with the 'timeout' but only returns after job completion.
+ * @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 arg1 The second argument for 'callback'
+ * @return 0 in case of success or -1 in case of error
+ */
+int jobs_invoke(
+ int timeout,
+ void (*callback)(int, void*),
+ void *arg)
+{
+ return jobs_invoke3(timeout, (job_cb_t)callback, arg, NULL, NULL);
+}
+
+/**
+ * Run a asynchronous job represented by 'callback' and 'arg[12]'
+ * with the 'timeout' but only returns after job completion.
+ * @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 parameters are the parameters 'arg[12]'
+ * given here.
+ * @param arg1 The second argument for 'callback'
+ * @param arg2 The third argument for 'callback'
+ * @return 0 in case of success or -1 in case of error
+ */
+int jobs_invoke2(
+ int timeout,
+ void (*callback)(int, void*, void*),
+ void *arg1,
+ void *arg2)
+{
+ return jobs_invoke3(timeout, (job_cb_t)callback, arg1, arg2, NULL);
+}
+
+/**
+ * Stops the thread pointed by 'arg1'. Used with
+ * invoke familly to return to the caller after completion.
+ * @param signum Unused
+ * @param arg1 The thread to stop
+ * @param arg2 Unused
+ * @param arg3 Unused
+ */
+static void unlock_invoker(int signum, void *arg1, void *arg2, void *arg3)
+{
+ struct thread *t = arg1;
+ pthread_mutex_lock(&mutex);
+ t->stop = 1;
+ if (t->waits)
+ pthread_cond_broadcast(&cond);
+ pthread_mutex_unlock(&mutex);
+}
+
+/**
+ * Run a asynchronous job represented by 'callback' and 'arg[123]'
+ * with the 'timeout' but only returns after job completion.
+ * @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 parameters are the parameters 'arg[123]'
+ * given here.
+ * @param arg1 The second argument for 'callback'
+ * @param arg2 The third argument for 'callback'
+ * @param arg3 The forth argument for 'callback'
+ * @return 0 in case of success or -1 in case of error
+ */
+int jobs_invoke3(
+ int timeout,
+ void (*callback)(int, void*, void *, void*),
+ void *arg1,
+ void *arg2,
+ void *arg3)
+{
+ struct job *job1, *job2;
+ struct thread me;
+
+ pthread_mutex_lock(&mutex);
+
+ /* allocates the job */
+ job1 = job_create(&me, timeout, callback, arg1, arg2, arg3);
+ job2 = job_create(&me, 0, unlock_invoker, &me, NULL, NULL);
+ if (!job1 || !job2) {
+ ERROR("out of memory");
+ errno = ENOMEM;
+ if (job1) {
+ job1->next = free_jobs;
+ free_jobs = job1;
+ }
+ if (job2) {
+ job2->next = free_jobs;
+ free_jobs = job2;
+ }
+ pthread_mutex_unlock(&mutex);
+ return -1;
+ }
+
+ /* queues the job */
+ job_add2(job1, job2);
+
+ /* run until stopped */
+ thread_run(&me);
+ pthread_mutex_unlock(&mutex);
+ return 0;
+}
+
+/**
+ * Initialise the job stuff.
+ * @param allowed_count Maximum count of thread for jobs (can be 0,
+ * see 'jobs_add_me' for merging new threads)
+ * @param start_count Count of thread to start now, must be lower.
+ * @param waiter_count Maximum count of jobs that can be waiting.
+ * @return 0 in case of success or -1 in case of error.
+ */
int jobs_init(int allowed_count, int start_count, int waiter_count)
{
+ int rc, launched;
+
+ assert(allowed_count >= 0);
+ assert(start_count >= 0);
+ assert(waiter_count > 0);
+ assert(start_count <= allowed_count);
+
/* records the allowed count */
allowed = allowed_count;
started = 0;
- running = 0;
+ waiting = 0;
remains = waiter_count;
/* start at least one thread */
pthread_mutex_lock(&mutex);
- while (started < start_count && start_one_thread() == 0);
+ launched = 0;
+ while (launched < start_count && start_one_thread() == 0)
+ launched++;
+ rc = -(launched != start_count);
pthread_mutex_unlock(&mutex);
/* end */
- return -(started != start_count);
+ if (rc)
+ ERROR("Not all threads can be started");
+ return rc;
}
-/* terminate all the threads and all pending requests */
-void jobs_terminate(int wait)
+/**
+ * Terminate all the threads and cancel all pending jobs.
+ */
+void jobs_terminate()
{
- struct job *job;
- pthread_t me, other;
+ 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;
- for(;;) {
- /* search the next thread to stop */
- t = threads;
- while (t && pthread_equal(t->tid, me))
- t = t->next;
- if (!t)
- break;
- /* stop it */
- other = t->tid;
+
+ /* 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;
+ }
+
+ /* stops the threads */
+ t = threads;
+ while (t) {
t->stop = 1;
- pthread_mutex_unlock(&mutex);
- pthread_cond_broadcast(&cond);
- pthread_join(other, NULL);
- pthread_mutex_lock(&mutex);
+ t = t->next;
}
- /* cancel pending jobs */
- while (first_job) {
- job = first_job;
- first_job = job->next;
- sig_monitor(0, job_cancel, job);
- free(job);
+ /* 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;
+ 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);
+ }
}
+ pthread_mutex_unlock(&mutex);
}
-int jobs_add_event_loop(void *key, int timeout, void (*evloop)(int signum, void*), void *closure)
+/**
+ * Adds the events waiter/dispatcher to the list of events waiters/dispatchers
+ * to monitor.
+ * @param key A key to register the events waiter/dispatcher (see
+ * 'jobs_del_events')
+ * @param timeout Timeout in second of the function or 0 if none
+ * @param events The callback, the first argument is 0 for normal
+ * flow or the signal number when normal flow failed
+ * @param closure The closure to give to the callback as secondd argument
+ * @return 0 in case of success or -1 in case of error
+ */
+int jobs_add_events(void *key, int timeout, void (*events)(int signum, void*), void *closure)
{
struct job *job;
pthread_mutex_lock(&mutex);
- job = job_create(key, timeout, (void (*)(int, void *, void *, void *))evloop, closure, NULL, NULL);
+
+ /* look at an already existsing events for same key */
+ job = events_of_key(key);
if (job) {
- /* adds the loop */
- job->next = first_evloop;
- first_evloop = job;
+ pthread_mutex_unlock(&mutex);
+ ERROR("events of key %p already exist", key);
+ errno = EEXIST;
+ return -1;
+ }
- /* signal the loop */
- pthread_cond_signal(&cond);
+ /* creates the job */
+ job = job_create(key, timeout, (job_cb_t)events, closure, NULL, NULL);
+ if (!job) {
+ pthread_mutex_unlock(&mutex);
+ ERROR("Can't create events, out of memory");
+ errno = ENOMEM;
+ return -1;
}
+
+ /* adds the loop */
+ job->next = first_events;
+ first_events = job;
+
+ /* signal the loop */
+ if (waiting)
+ pthread_cond_signal(&cond);
pthread_mutex_unlock(&mutex);
- return -!job;
+ return 0;
}
-int jobs_add_me()
+/**
+ * Removes the events of 'key'
+ * @param key The key of the events to remove
+ * @return 0 in case of success or -1 in case of error
+ */
+int jobs_del_events(void *key)
{
- pthread_t me;
- struct thread *t;
-
- /* how am i? */
- me = pthread_self();
+ struct job *job;
- /* request all threads to stop */
pthread_mutex_lock(&mutex);
- t = threads;
- while (t) {
- if (pthread_equal(t->tid, me)) {
- pthread_mutex_unlock(&mutex);
- ERROR("thread already running");
- errno = EINVAL;
- return -1;
- }
- t = t->next;
+ job = events_of_key(key);
+ if (job)
+ if (job->blocked)
+ job->dropped = 1;
+ else
+ events_release(job);
+ pthread_mutex_unlock(&mutex);
+ if (!job) {
+ ERROR("events of key %p not found", key);
+ errno = ENOENT;
}
+ return -!job;
+}
- /* allowed... */
- allowed++;
- pthread_mutex_unlock(&mutex);
+/**
+ * Adds the current thread to the pool of threads
+ * processing the jobs. Returns normally when the threads are
+ * terminated or immediately with an error if the thread is
+ * already in the pool.
+ * @return 0 in case of success or -1 in case of error
+ */
+int jobs_add_me()
+{
+ struct thread me;
- /* run */
- thread_main_loop(NULL);
+ /* check whether already running */
+ if (current) {
+ ERROR("thread already running");
+ errno = EINVAL;
+ return -1;
+ }
- /* returns */
+ /* allowed... */
pthread_mutex_lock(&mutex);
+ allowed++;
+ thread_run(&me);
allowed--;
pthread_mutex_unlock(&mutex);
return 0;