Changeset 40a1392 for libcfa/src/concurrency

Timestamp:

Oct 9, 2020, 6:12:50 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

04423b53

Parents:

3ca7ef3 (diff), 8fc9a5f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc into master

Location:

libcfa/src/concurrency

Files:

• coroutine.cfa (modified) (3 diffs)
• coroutine.hfa (modified) (3 diffs)
• locks.cfa (added)
• locks.hfa (added)

libcfa/src/concurrency/coroutine.cfa

@@ -47 +47 @@
 
 //-----------------------------------------------------------------------------
-FORALL_DATA_INSTANCE(CoroutineCancelled,
-                (dtype coroutine_t | sized(coroutine_t)), (coroutine_t))
+FORALL_DATA_INSTANCE(CoroutineCancelled, (dtype coroutine_t), (coroutine_t))
 
 struct __cfaehm_node {
@@ -59 +58 @@
 void mark_exception(CoroutineCancelled(T) *) {}
 
-forall(dtype T | sized(T))
+forall(dtype T)
 void copy(CoroutineCancelled(T) * dst, CoroutineCancelled(T) * src) {
         dst->the_coroutine = src->the_coroutine;
@@ -77 +76 @@
         exception_t * except = (exception_t *)(1 + (__cfaehm_node *)desc->cancellation);
 
+        // TODO: Remove explitate vtable set once trac#186 is fixed.
         CoroutineCancelled(T) except;
+        except.virtual_table = &get_exception_vtable(&except);
         except.the_coroutine = &cor;
         except.the_exception = except;

libcfa/src/concurrency/coroutine.hfa

@@ -22 +22 @@
 //-----------------------------------------------------------------------------
 // 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)) (
+FORALL_DATA_EXCEPTION(CoroutineCancelled, (dtype coroutine_t), (coroutine_t)) (
         coroutine_t * the_coroutine;
         exception_t * the_exception;
@@ -30 +28 @@
 
 forall(dtype T)
-void mark_exception(CoroutineCancelled(T) *);
-
-forall(dtype T | sized(T))
 void copy(CoroutineCancelled(T) * dst, CoroutineCancelled(T) * src);
 
@@ -42 +37 @@
 // 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))) {
+trait is_coroutine(dtype T | IS_RESUMPTION_EXCEPTION(CoroutineCancelled, (T))) {
         void main(T & this);
         $coroutine * get_coroutine(T & this);