libthreads: thread_join: return 'int' as status

[model-checker.git] / libthreads.h

diff --git a/libthreads.h b/libthreads.h
index b73ab1c0cee46fc063c42d703f2b8e922d0d5210..1ea54ea758ea895eeac0230082645fc1da9d7ce9 100644 (file)
--- a/libthreads.h
+++ b/libthreads.h
@@ -1,30 +1,31 @@
 #ifndef __LIBTHREADS_H__
 #define __LIBTHREADS_H__
 
-#include <stdio.h>
 #include <ucontext.h>
 
-//#define CONFIG_DEBUG
+typedef enum thread_state {
+       THREAD_CREATED,
+       THREAD_RUNNING,
+       THREAD_READY,
+       THREAD_COMPLETED
+} thread_state;
 
-#ifdef CONFIG_DEBUG
-#define DEBUG(fmt, ...) do { printf("*** %25s(): line %-4d *** " fmt, __func__, __LINE__, ##__VA_ARGS__); } while (0)
-#define DBG() DEBUG("\n");
-#else
-#define DEBUG(fmt, ...)
-#define DBG()
-#endif
+typedef int thread_id_t;
 
 struct thread {
-       void (*start_routine);
+       void (*start_routine)();
        void *arg;
        ucontext_t context;
        void *stack;
-       int index;
-       int completed;
+       thread_id_t id;
+       thread_state state;
 };
 
-int thread_create(struct thread *t, void (*start_routine), void *arg);
-void thread_join(struct thread *t);
+int thread_create(struct thread *t, void (*start_routine)(), void *arg);
+int thread_join(struct thread *t);
+int thread_yield(void);
 struct thread *thread_current(void);
 
+extern void user_main(void);
+
 #endif /* __LIBTHREADS_H__ */