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

File:

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

libcfa/src/concurrency/thread.cfa

@@ -62 +62 @@
 }
 
-EHM_VIRTUAL_TABLE(SomeThreadCancelled, std_thread_cancelled);
+FORALL_DATA_INSTANCE(ThreadCancelled, (thread_t &), (thread_t))
 
 forall(T &)
@@ -73 +73 @@
 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" );
 }
 
-static void default_thread_cancel_handler(SomeThreadCancelled & ) {
-        // Improve this error message, can I do formatting?
-        abort( "Unhandled thread cancellation.\n" );
-}
-
-forall(T & | is_thread(T) | IS_EXCEPTION(SomeThreadCancelled))
+forall(T & | is_thread(T) | IS_EXCEPTION(ThreadCancelled, (T)))
 void ?{}( thread_dtor_guard_t & this,
-                T & thrd, void(*cancelHandler)(SomeThreadCancelled &)) {
-        $monitor * m = get_monitor(thrd);
+                T & thrd, void(*cancelHandler)(ThreadCancelled(T) &)) {
+        $monitor * m = get_monitor(thrd);
         $thread * desc = get_thread(thrd);
 
         // Setup the monitor guard
         void (*dtor)(T& mutex this) = ^?{};
-        bool join = cancelHandler != (void(*)(SomeThreadCancelled&))0;
+        bool join = cancelHandler != (void(*)(ThreadCancelled(T)&))0;
         (this.mg){&m, (void(*)())dtor, join};
 
@@ -109 +103 @@
         }
         desc->state = Cancelled;
-        void(*defaultResumptionHandler)(SomeThreadCancelled &) =
+        void(*defaultResumptionHandler)(ThreadCancelled(T) &) = 
                 join ? cancelHandler : default_thread_cancel_handler;
 
+        ThreadCancelled(T) except;
         // TODO: Remove explitate vtable set once trac#186 is fixed.
-        SomeThreadCancelled except;
-        except.virtual_table = &std_thread_cancelled;
+        except.virtual_table = &get_exception_vtable(&except);
         except.the_thread = &thrd;
         except.the_exception = __cfaehm_cancellation_exception( cancellation );
-        // Why is this cast required?
-        throwResume (SomeThreadCancelled &)except;
+        throwResume except;
 
         except.the_exception->virtual_table->free( except.the_exception );
@@ -165 +158 @@
 
 //-----------------------------------------------------------------------------
-forall(T & | is_thread(T) | IS_RESUMPTION_EXCEPTION(SomeThreadCancelled))
+forall(T & | is_thread(T) | IS_RESUMPTION_EXCEPTION(ThreadCancelled, (T)))
 T & join( T & this ) {
         thread_dtor_guard_t guard = { this, defaultResumptionHandler };