Cleanup scaffolds

[mirrors/Programs.git] / c / pthread_extra / pthread_pause.c

diff --git a/c/pthread_extra/pthread_pause.c b/c/pthread_extra/pthread_pause.c
index 1eacdf498d049aa2f50e73219f0042375612b11d..c0d43507d12702e4b6174d99d299e8cbbb3700df 100644 (file)
--- a/c/pthread_extra/pthread_pause.c
+++ b/c/pthread_extra/pthread_pause.c
@@ -7,6 +7,8 @@
 #include <unistd.h>
 #include <sys/resource.h>
 //#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
 //#include <sys/time.h>
 
 void pthread_pause_handler() {
@@ -55,16 +57,62 @@ void pthread_pause_disable() {
        pthread_sigmask(SIG_BLOCK, &sigset, NULL);
 }
 
+int pthread_pause_reschedule(pthread_t thread) {
+       //Send signal to initiate pause handler
+       while(pthread_kill(thread, PTHREAD_XSIG_STOP) == EAGAIN) usleep(1000);
+       return 0;
+}
+
 int pthread_pause(pthread_t thread) {
        //Set thread as paused and notify it via signal (wait when queue full)
        pthread_user_data_internal(thread)->running = 0;
-       while(pthread_kill(thread, PTHREAD_XSIG_STOP) == EAGAIN) usleep(1000);
+       pthread_pause_reschedule(thread);
        return 0;
 }
 
 int pthread_unpause(pthread_t thread) {
        //Set thread as running and notify it via signal (wait when queue full)
        pthread_user_data_internal(thread)->running = 1;
-       while(pthread_kill(thread, PTHREAD_XSIG_STOP) == EAGAIN) usleep(1000);
+       pthread_pause_reschedule(thread);
        return 0;
 }
+
+
+
+// Wrappers ///////////////////////////////////////////////////////////
+
+
+typedef struct pthread_extra_wrapper_t {
+       void *(*start_routine)(void *);
+       void *restrict arg;
+} pthread_extra_wrapper_t;
+
+void *pthread_extra_thread_wrapper(void *arg) {
+       pthread_extra_wrapper_t task = *((pthread_extra_wrapper_t*)arg);
+       free(arg);
+
+       //Register new thread to user data structure
+       pthread_user_data_internal(pthread_self());
+
+       //TODO: user_data should do this automaticaly?
+       pthread_cleanup_push(pthread_user_data_cleanup, (void *)pthread_self());
+
+       //Check if we should be running according to pthread_pause sub-scheduler
+       pthread_pause_reschedule(pthread_self());
+
+       return task.start_routine(task.arg);
+
+       pthread_cleanup_pop(1); //Needed by pthread_cleanup_push() macro
+}
+
+int pthread_extra_create(pthread_t *restrict thread,
+                          const pthread_attr_t *restrict attr,
+                          void *(*start_routine)(void *),
+                          void *restrict arg) {
+
+       pthread_extra_wrapper_t *task = malloc(sizeof(pthread_extra_wrapper_t));
+       assert(task != NULL);
+       task->start_routine=start_routine;
+       task->arg=arg;
+       return pthread_create(thread, attr, pthread_extra_thread_wrapper, task);
+}