Changes in libcfa/src/concurrency/thread.cfa [fd54fef:5456537]

File:

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

libcfa/src/concurrency/thread.cfa

@@ -39 +39 @@
         link.next = 0p;
         link.prev = 0p;
-        link.preferred = -1;
         #if defined( __CFA_WITH_VERIFY__ )
                 canary = 0x0D15EA5E0D15EA5Ep;
@@ -62 +61 @@
 }
 
-FORALL_DATA_INSTANCE(ThreadCancelled, (thread_t &), (thread_t))
-
 forall(T &)
 void copy(ThreadCancelled(T) * dst, ThreadCancelled(T) * src) {
@@ -73 +70 @@
 forall(T &)
 const char * msg(ThreadCancelled(T) *) {
-        return "ThreadCancelled";
+        return "ThreadCancelled(...)";
 }
 
 forall(T &)
 static void default_thread_cancel_handler(ThreadCancelled(T) & ) {
+        // Improve this error message, can I do formatting?
         abort( "Unhandled thread cancellation.\n" );
 }
 
-forall(T & | is_thread(T) | IS_EXCEPTION(ThreadCancelled, (T)))
+forall(T & | is_thread(T) | IS_EXCEPTION(ThreadCancelled, (T))
+    | { EHM_DEFAULT_VTABLE(ThreadCancelled, (T)); })
 void ?{}( thread_dtor_guard_t & this,
                 T & thrd, void(*cancelHandler)(ThreadCancelled(T) &)) {
-        $monitor * m = get_monitor(thrd);
+        $monitor * m = get_monitor(thrd);
         $thread * desc = get_thread(thrd);
 
@@ -103 +102 @@
         }
         desc->state = Cancelled;
-        void(*defaultResumptionHandler)(ThreadCancelled(T) &) = 
+        void(*defaultResumptionHandler)(ThreadCancelled(T) &) =
                 join ? cancelHandler : default_thread_cancel_handler;
 
+        // TODO: Remove explitate vtable set once trac#186 is fixed.
         ThreadCancelled(T) except;
-        // TODO: Remove explitate vtable set once trac#186 is fixed.
-        except.virtual_table = &get_exception_vtable(&except);
+        except.virtual_table = &_default_vtable;
         except.the_thread = &thrd;
         except.the_exception = __cfaehm_cancellation_exception( cancellation );
-        throwResume except;
+        // Why is this cast required?
+        throwResume (ThreadCancelled(T) &)except;
 
         except.the_exception->virtual_table->free( except.the_exception );
@@ -134 +134 @@
         /* paranoid */ verify( this_thrd->context.SP );
 
-        __schedule_thread( this_thrd );
-        enable_interrupts( __cfaabi_dbg_ctx );
+        schedule_thread$( this_thrd );
+        enable_interrupts();
 }
 
@@ -158 +158 @@
 
 //-----------------------------------------------------------------------------
-forall(T & | is_thread(T) | IS_RESUMPTION_EXCEPTION(ThreadCancelled, (T)))
+forall(T & | is_thread(T) | IS_RESUMPTION_EXCEPTION(ThreadCancelled, (T))
+    | { EHM_DEFAULT_VTABLE(ThreadCancelled, (T)); })
 T & join( T & this ) {
         thread_dtor_guard_t guard = { this, defaultResumptionHandler };
@@ -167 +168 @@
         disable_interrupts();
         uint64_t ret = __tls_rand();
-        enable_interrupts( __cfaabi_dbg_ctx );
+        enable_interrupts();
         return ret;
 }