reformat DEBUG messages

[model-checker.git] / libthreads.c

diff --git a/libthreads.c b/libthreads.c
index 4545ee3640a79a542e1c61f199bd37853c4c9231..959fb77245e9849f56d4de1a7586a737dbca6246 100644 (file)
--- a/libthreads.c
+++ b/libthreads.c
@@ -1,113 +1,151 @@
 #include <string.h>
 #include <stdlib.h>
-#include <ucontext.h>
-#include <stdio.h>
 
-//#define CONFIG_DEBUG
-
-#ifdef CONFIG_DEBUG
-#define DBG() do { printf("Here: %s, L%d\n", __func__, __LINE__); } while (0)
-#define DEBUG(fmt, ...) printf(fmt, ##__VA_ARGS__)
-#else
-#define DBG()
-#define DEBUG(fmt, ...)
-#endif
+#include "libthreads.h"
 
 #define STACK_SIZE (1024 * 1024)
 
-struct thread {
-       void (*start_routine);
-       void *arg;
-       ucontext_t context;
-       void *stack;
-       int index;
-};
-
-static struct thread *current;
-static ucontext_t *cleanup;
+static struct thread *current, *main_thread;
 
 static void *stack_allocate(size_t size)
 {
        return malloc(size);
 }
 
-int thread_create(struct thread *t, void (*start_routine), void *arg)
+static int create_context(struct thread *t)
 {
-       static int created;
-       ucontext_t local;
+       int ret;
 
-       DBG();
-
-       t->index = created++;
-       DEBUG("create thread %d\n", t->index);
+       memset(&t->context, 0, sizeof(t->context));
+       ret = getcontext(&t->context);
+       if (ret)
+               return ret;
 
-       t->start_routine = start_routine;
-       t->arg = arg;
+       /* t->start_routine == NULL means this is our initial context */
+       if (!t->start_routine)
+               return 0;
 
-       /* Initialize state */
-       getcontext(&t->context);
+       /* Initialize new managed context */
        t->stack = stack_allocate(STACK_SIZE);
        t->context.uc_stack.ss_sp = t->stack;
        t->context.uc_stack.ss_size = STACK_SIZE;
        t->context.uc_stack.ss_flags = 0;
-       if (current)
-               t->context.uc_link = &current->context;
-       else
-               t->context.uc_link = cleanup;
+       t->context.uc_link = &main_thread->context;
        makecontext(&t->context, t->start_routine, 1, t->arg);
 
        return 0;
 }
 
-void thread_start(struct thread *t)
+static int create_initial_thread(struct thread *t)
 {
-       DBG();
+       memset(t, 0, sizeof(*t));
+       return create_context(t);
+}
 
+static int thread_swap(struct thread *old, struct thread *new)
+{
+       return swapcontext(&old->context, &new->context);
+}
+
+static int thread_yield()
+{
+       struct thread *old, *next;
+
+       DBG();
        if (current) {
-               struct thread *old = current;
-               current = t;
-               swapcontext(&old->context, &current->context);
+               old = current;
+               schedule_add_thread(old);
        } else {
-               current = t;
-               swapcontext(cleanup, &current->context);
+               old = main_thread;
+       }
+       schedule_choose_next(&next);
+       current = next;
+       return thread_swap(old, next);
+}
+
+static int master_thread_yield()
+{
+       struct thread *next;
+
+       DBG();
+
+       if (current) {
+               DEBUG("completed thread %d\n", current->index);
+               current->completed = 1;
+       }
+       schedule_choose_next(&next);
+       if (next && !next->completed) {
+               current = next;
+               return thread_swap(main_thread, next);
        }
+       return 1;
+}
+
+int thread_create(struct thread *t, void (*start_routine), void *arg)
+{
+       static int created = 1;
+       int ret = 0;
+
        DBG();
+
+       memset(t, 0, sizeof(*t));
+       t->index = created++;
+       DEBUG("create thread %d\n", t->index);
+
+       t->start_routine = start_routine;
+       t->arg = arg;
+
+       /* Initialize state */
+       ret = create_context(t);
+       if (ret)
+               return ret;
+
+       schedule_add_thread(t);
+       return 0;
+}
+
+void thread_join(struct thread *t)
+{
+       while (!t->completed)
+               thread_yield();
 }
 
 void a(int *idx)
 {
        int i;
 
-       for (i = 0; i < 10; i++)
+       for (i = 0; i < 10; i++) {
                printf("Thread %d, loop %d\n", *idx, i);
+               if (i % 2)
+                       thread_yield();
+       }
 }
 
 void user_main()
 {
        struct thread t1, t2;
-       int i = 1, j = 2;
+       int i = 2, j = 3;
 
+       printf("%s() creating 2 threads\n", __func__);
        thread_create(&t1, &a, &i);
        thread_create(&t2, &a, &j);
 
-       printf("user_main() is going to start 2 threads\n");
-       thread_start(&t1);
-       thread_start(&t2);
-       printf("user_main() is finished\n");
+       thread_join(&t1);
+       thread_join(&t2);
+       printf("%s() is finished\n", __func__);
 }
 
 int main()
 {
-       struct thread t;
-       ucontext_t main_context;
-
-       cleanup = &main_context;
+       struct thread user_thread;
 
-       thread_create(&t, &user_main, NULL);
+       main_thread = malloc(sizeof(struct thread));
+       create_initial_thread(main_thread);
 
-       thread_start(&t);
+       thread_create(&user_thread, &user_main, NULL);
 
-       DBG();
+       /* Wait for all threads to complete */
+       while (master_thread_yield() == 0);
 
        DEBUG("Exiting\n");
        return 0;