diff options
author | Alex Auvolat <alex.auvolat@ens.fr> | 2014-12-16 21:34:32 +0100 |
---|---|---|
committer | Alex Auvolat <alex.auvolat@ens.fr> | 2014-12-16 21:34:32 +0100 |
commit | 0cafda1270f765e98c6ab5b298d28fd820b0e68c (patch) | |
tree | 05b61752243aad3e916f78c1989cabe3b18d84cf /kernel/include | |
parent | ab35e5fac02f11f0bd742020b112a09e5b1f2de5 (diff) | |
download | macroscope-0cafda1270f765e98c6ab5b298d28fd820b0e68c.tar.gz macroscope-0cafda1270f765e98c6ab5b298d28fd820b0e68c.zip |
Remove stupid thread "resume_with_result" stuff.
Diffstat (limited to 'kernel/include')
-rw-r--r-- | kernel/include/thread.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/kernel/include/thread.h b/kernel/include/thread.h index 03277a2..4c5f337 100644 --- a/kernel/include/thread.h +++ b/kernel/include/thread.h @@ -5,8 +5,8 @@ #include <region.h> #define T_STATE_RUNNING 1 -#define T_STATE_FINISHED 2 -#define T_STATE_WAITING 3 +#define T_STATE_PAUSED 2 +#define T_STATE_FINISHED 3 #define KPROC_STACK_SIZE 0x8000 // 8Kb @@ -22,8 +22,6 @@ typedef struct thread { pagedir_t *current_pd_d; uint32_t state; - void* result; - bool has_result; region_info_t *stack_region; @@ -35,13 +33,13 @@ typedef struct thread { typedef void (*entry_t)(void*); void threading_setup(entry_t cont, void* data); // never returns -thread_t *new_thread(entry_t entry); // thread is PAUSED, and must be resume_thread_with_result'ed +thread_t *new_thread(entry_t entry, void* data); // thread is PAUSED, and must be resume_thread'ed extern thread_t *current_thread; void yield(); -void* wait_for_result(); +void pause(); -void resume_thread_with_result(thread_t *thread, void* data, bool run_at_once); +void resume_thread(thread_t *thread, bool run_at_once); /* vim: set ts=4 sw=4 tw=0 noet :*/ |