Changes in libcfa/src/concurrency/thread.cfa [ac2b598:09f357ec]

File:

• libcfa/src/concurrency/thread.cfa (modified) (3 diffs)

libcfa/src/concurrency/thread.cfa

@@ -23 +23 @@
 #include "invoke.h"
 
+extern "C" {
+        #include <fenv.h>
+        #include <stddef.h>
+}
+
+//extern volatile thread_local processor * this_processor;
+
 //-----------------------------------------------------------------------------
 // Thread ctors and dtors
-void ?{}($thread & this, const char * const name, cluster & cl, void * storage, size_t storageSize ) with( this ) {
+void ?{}(thread_desc & this, const char * const name, cluster & cl, void * storage, size_t storageSize ) with( this ) {
         context{ 0p, 0p };
         self_cor{ name, storage, storageSize };
         state = Start;
-        preempted = __NO_PREEMPTION;
         curr_cor = &self_cor;
         self_mon.owner = &this;
@@ -44 +50 @@
 }
 
-void ^?{}($thread& this) with( this ) {
+void ^?{}(thread_desc& this) with( this ) {
         unregister(curr_cluster, this);
         ^self_cor{};
 }
 
-//-----------------------------------------------------------------------------
-// Starting and stopping threads
-forall( dtype T | is_thread(T) )
-void __thrd_start( T & this, void (*main_p)(T &) ) {
-        $thread * this_thrd = get_thread(this);
-
-        disable_interrupts();
-        __cfactx_start(main_p, get_coroutine(this), this, __cfactx_invoke_thread);
-
-        this_thrd->context.[SP, FP] = this_thrd->self_cor.context.[SP, FP];
-        verify( this_thrd->context.SP );
-
-        __schedule_thread(this_thrd);
-        enable_interrupts( __cfaabi_dbg_ctx );
-}
-
-//-----------------------------------------------------------------------------
-// Support for threads that don't ues the thread keyword
 forall( dtype T | sized(T) | is_thread(T) | { void ?{}(T&); } )
 void ?{}( scoped(T)& this ) with( this ) {
@@ -84 +72 @@
 }
 
+//-----------------------------------------------------------------------------
+// Starting and stopping threads
+forall( dtype T | is_thread(T) )
+void __thrd_start( T & this, void (*main_p)(T &) ) {
+        thread_desc * this_thrd = get_thread(this);
+        thread_desc * curr_thrd = TL_GET( this_thread );
+
+        disable_interrupts();
+        CtxStart(main_p, get_coroutine(this), this, CtxInvokeThread);
+
+        this_thrd->context.[SP, FP] = this_thrd->self_cor.context.[SP, FP];
+        verify( this_thrd->context.SP );
+        // CtxSwitch( &curr_thrd->context, &this_thrd->context );
+
+        ScheduleThread(this_thrd);
+        enable_interrupts( __cfaabi_dbg_ctx );
+}
+
+void yield( void ) {
+        // Safety note : This could cause some false positives due to preemption
+      verify( TL_GET( preemption_state.enabled ) );
+        BlockInternal( TL_GET( this_thread ) );
+        // Safety note : This could cause some false positives due to preemption
+      verify( TL_GET( preemption_state.enabled ) );
+}
+
+void yield( unsigned times ) {
+        for( unsigned i = 0; i < times; i++ ) {
+                yield();
+        }
+}
+
 // Local Variables: //
 // mode: c //