Changes in libcfa/src/concurrency/thread.cfa [e873838:b4b63e8]

File:

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

libcfa/src/concurrency/thread.cfa

@@ -19 +19 @@
 
 #include "kernel_private.hfa"
-#include "exception.hfa"
 
 #define __CFA_INVOKE_PRIVATE__
@@ -29 +28 @@
         context{ 0p, 0p };
         self_cor{ name, storage, storageSize };
-        ticket = TICKET_RUNNING;
+        ticket = 1;
         state = Start;
         preempted = __NO_PREEMPTION;
@@ -59 +58 @@
 }
 
-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);
-        void (*dtor)(T& mutex this) = ^?{};
-        bool join = defaultResumptionHandler != (void(*)(ThreadCancelled(T)&))0;
-        (this.mg){&m, (void(*)())dtor, join};
-
-        // After the guard set-up and any wait, check for cancellation.
-        $thread * desc = get_thread(thrd);
-        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
@@ -127 +70 @@
         verify( this_thrd->context.SP );
 
-        __schedule_thread( this_thrd );
+        __schedule_thread( (__processor_id_t *)kernelTLS.this_processor, this_thrd);
         enable_interrupts( __cfaabi_dbg_ctx );
 }
@@ -150 +93 @@
 }
 
-//-----------------------------------------------------------------------------
-forall(dtype T | is_thread(T) | IS_RESUMPTION_EXCEPTION(ThreadCancelled, (T)))
-T & join( T & this ) {
-        thread_dtor_guard_t guard = { this, defaultResumptionHandler };
-        return this;
-}
-
 // Local Variables: //
 // mode: c //