Changes in libcfa/src/concurrency/coroutine.hfa [1c01c58:ae7be7a]

File:

• libcfa/src/concurrency/coroutine.hfa (modified) (4 diffs)

libcfa/src/concurrency/coroutine.hfa

@@ -18 +18 @@
 #include <assert.h>
 #include "invoke.h"
-#include "../exception.hfa"
-
-//-----------------------------------------------------------------------------
-// Exception thrown from resume when a coroutine stack is cancelled.
-// Should not have to be be sized (see trac #196).
-FORALL_DATA_EXCEPTION(CoroutineCancelled,
-                (dtype coroutine_t | sized(coroutine_t)), (coroutine_t)) (
-        coroutine_t * the_coroutine;
-        exception_t * the_exception;
-);
-
-forall(dtype T)
-void mark_exception(CoroutineCancelled(T) *);
-
-forall(dtype T | sized(T))
-void copy(CoroutineCancelled(T) * dst, CoroutineCancelled(T) * src);
-
-forall(dtype T)
-const char * msg(CoroutineCancelled(T) *);
 
 //-----------------------------------------------------------------------------
@@ -42 +23 @@
 // Anything that implements this trait can be resumed.
 // Anything that is resumed is a coroutine.
-trait is_coroutine(dtype T | sized(T)
-                | is_resumption_exception(CoroutineCancelled(T))
-                | VTABLE_ASSERTION(CoroutineCancelled, (T))) {
-        void main(T & this);
-        $coroutine * get_coroutine(T & this);
+trait is_coroutine(dtype T) {
+      void main(T & this);
+      $coroutine * get_coroutine(T & this);
 };
 
@@ -134 +113 @@
 }
 
-forall(dtype T | is_coroutine(T))
-void __cfaehm_cancelled_coroutine( T & cor, $coroutine * desc );
-
 // Resume implementation inlined for performance
 forall(dtype T | is_coroutine(T))
@@ -169 +145 @@
         // always done for performance testing
         $ctx_switch( src, dst );
-        if ( unlikely(dst->cancellation) ) {
-                __cfaehm_cancelled_coroutine( cor, dst );
-        }
 
         return cor;