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

File:

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

libcfa/src/concurrency/thread.cfa

@@ -19 +19 @@
 
 #include "kernel_private.hfa"
-#include "exception.hfa"
 
 #define __CFA_INVOKE_PRIVATE__
 #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 };
-        ticket = TICKET_RUNNING;
         state = Start;
-        preempted = __NO_PREEMPTION;
         curr_cor = &self_cor;
         self_mon.owner = &this;
@@ -37 +41 @@
         self_mon_p = &self_mon;
         curr_cluster = &cl;
-        link.next = 0p;
-        link.prev = 0p;
-        link.preferred = -1;
-        #if defined( __CFA_WITH_VERIFY__ )
-                canary = 0x0D15EA5E0D15EA5Ep;
-        #endif
-
-        seqable.next = 0p;
-        seqable.back = 0p;
+        next = 0p;
 
         node.next = 0p;
@@ -54 +50 @@
 }
 
-void ^?{}($thread& this) with( this ) {
-        #if defined( __CFA_WITH_VERIFY__ )
-                canary = 0xDEADDEADDEADDEADp;
-        #endif
+void ^?{}(thread_desc& this) with( this ) {
         unregister(curr_cluster, this);
         ^self_cor{};
 }
 
-FORALL_DATA_INSTANCE(ThreadCancelled, (dtype thread_t), (thread_t))
-
-forall(dtype T)
-void copy(ThreadCancelled(T) * dst, ThreadCancelled(T) * src) {
-        dst->virtual_table = src->virtual_table;
-        dst->the_thread = src->the_thread;
-        dst->the_exception = src->the_exception;
-}
-
-forall(dtype T)
-const char * msg(ThreadCancelled(T) *) {
-        return "ThreadCancelled";
-}
-
-forall(dtype T)
-static void default_thread_cancel_handler(ThreadCancelled(T) & ) {
-        abort( "Unhandled thread cancellation.\n" );
-}
-
-forall(dtype T | is_thread(T) | IS_EXCEPTION(ThreadCancelled, (T)))
-void ?{}( thread_dtor_guard_t & this,
-                T & thrd, void(*defaultResumptionHandler)(ThreadCancelled(T) &)) {
-        $monitor * m = get_monitor(thrd);
-        $thread * desc = get_thread(thrd);
-
-        // Setup the monitor guard
-        void (*dtor)(T& mutex this) = ^?{};
-        bool join = defaultResumptionHandler != (void(*)(ThreadCancelled(T)&))0;
-        (this.mg){&m, (void(*)())dtor, join};
-
-
-        /* paranoid */ verifyf( Halted == desc->state || Cancelled == desc->state, "Expected thread to be Halted or Cancelled, was %d\n", (int)desc->state );
-
-        // After the guard set-up and any wait, check for cancellation.
-        struct _Unwind_Exception * cancellation = desc->self_cor.cancellation;
-        if ( likely( 0p == cancellation ) ) {
-                return;
-        } else if ( Cancelled == desc->state ) {
-                return;
-        }
-        desc->state = Cancelled;
-        if (!join) {
-                defaultResumptionHandler = default_thread_cancel_handler;
-        }
-
-        ThreadCancelled(T) except;
-        // TODO: Remove explitate vtable set once trac#186 is fixed.
-        except.virtual_table = &get_exception_vtable(&except);
-        except.the_thread = &thrd;
-        except.the_exception = __cfaehm_cancellation_exception( cancellation );
-        throwResume except;
-
-        except.the_exception->virtual_table->free( except.the_exception );
-        free( cancellation );
-        desc->self_cor.cancellation = 0p;
-}
-
-void ^?{}( thread_dtor_guard_t & this ) {
-        ^(this.mg){};
-}
-
-//-----------------------------------------------------------------------------
-// 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];
-        /* paranoid */ 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 ) {
@@ -159 +73 @@
 
 //-----------------------------------------------------------------------------
-forall(dtype T | is_thread(T) | IS_RESUMPTION_EXCEPTION(ThreadCancelled, (T)))
-T & join( T & this ) {
-        thread_dtor_guard_t guard = { this, defaultResumptionHandler };
-        return this;
+// 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 );
 }
 
-uint64_t thread_rand() {
-        disable_interrupts();
-        uint64_t ret = __tls_rand();
-        enable_interrupts( __cfaabi_dbg_ctx );
-        return ret;
+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();
+        }
 }