Changes in src/libcfa/concurrency/threads.c [c84e80a:e15df4c]

File:

• src/libcfa/concurrency/threads.c (modified) (2 diffs)

src/libcfa/concurrency/threads.c

@@ -23 +23 @@
 #include "invoke.h"
 
-#include <stdlib>
+extern "C" {
+        #include <stddef.h>
+}
+
+extern processor * get_this_processor();
 
 //-----------------------------------------------------------------------------
 // Forward declarations
-forall(otype T | is_thread(T) )
-void start( thread(T)* this );
+forall( dtype T | sized(T) | is_thread(T) )
+void start( T* this );
 
-forall(otype T | is_thread(T) )
-void stop( thread(T)* this );
+forall( dtype T | sized(T) | is_thread(T) )
+void stop( T* this );
 
 //-----------------------------------------------------------------------------
 // Thread ctors and dtors
 
-void ?{}(thread_h* this) {
+void ?{}(thread* this) {
         (&this->c){};
+        this->c.name = "Anonymous Coroutine";
+        (&this->lock){};
+        this->next = NULL;
 }
 
-void ^?{}(thread_h* this) {
+void ^?{}(thread* this) {
         ^(&this->c){};
 }
 
-forall(otype T | is_thread(T) )
-void ?{}( thread(T)* this ) {
-        printf("thread() ctor\n");
+forall( dtype T | sized(T) | is_thread(T) | { void ?{}(T*); } )
+void ?{}( scoped(T)* this ) {
         (&this->handle){};
-        start(this);
+        start(&this->handle);
 }
 
-forall(otype T, ttype P | is_thread(T) | { void ?{}(T*, P); } )
-void ?{}( thread(T)* this, P params ) {
+forall( dtype T, ttype P | sized(T) | is_thread(T) | { void ?{}(T*, P); } )
+void ?{}( scoped(T)* this, P params ) {
         (&this->handle){ params };
-        start(this);
+        start(&this->handle);
 }
 
-forall(otype T | is_thread(T) )
-void ^?{}( thread(T)* this ) {
-        stop(this);
+forall( dtype T | sized(T) | is_thread(T) | { void ^?{}(T*); } )
+void ^?{}( scoped(T)* this ) {
+        stop(&this->handle);
         ^(&this->handle){};
 }
@@ -70 +76 @@
 }
 
-forall(otype T | is_thread(T))
-void start( thread(T)* this ) {
-        T* handle  = &this->handle;
-        coroutine* thrd_c = get_coroutine(handle);
-        thread_h*  thrd_h = get_thread   (handle);
+extern void thread_schedule( thread * );
+
+forall( dtype T | sized(T) | is_thread(T) )
+void start( T* this ) {
+        coroutine* thrd_c = get_coroutine(this);
+        thread*  thrd_h = get_thread   (this);
         thrd_c->last = this_coroutine();
-        current_coroutine = thrd_c;
+        get_this_processor()->current_coroutine = thrd_c;
 
         // LIB_DEBUG_PRINTF("Thread start : %p (t %p, c %p)\n", handle, thrd_c, thrd_h);
 
         create_stack(&thrd_c->stack, thrd_c->stack.size);
-        CtxStart(handle, CtxInvokeThread);
+        CtxStart(this, CtxInvokeThread);
         CtxSwitch( thrd_c->last->stack.context, thrd_c->stack.context );
 
-        scheduler_add(thrd_h);
+        thread_schedule(thrd_h);
 }
 
-forall(otype T | is_thread(T) )
-void stop( thread(T)* this ) {
+forall( dtype T | sized(T) | is_thread(T) )
+void stop( T* this ) {
+        thread*  thrd = get_thread(this);
+        if( thrd->c.notHalted ) {
+                lock( &thrd->lock );
+        }
+}
 
+void signal_termination( thread * this ) {
+        this->c.state = Halt;
+      this->c.notHalted = false;
+        unlock( &this->lock );
+}
+
+void yield( void ) {
+        thread_schedule( this_thread() );
+        suspend();
 }