Changeset 87d13cd for src/libcfa/concurrency/thread

Timestamp:

Mar 21, 2017, 10:07:52 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

cb91437

Parents:

829c907 (diff), a53e10a (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:

fix conflicit in iostream.c

File:

• src/libcfa/concurrency/thread (modified) (3 diffs)

src/libcfa/concurrency/thread

@@ -22 +22 @@
 
 #include "coroutine"
+#include "monitor"
 
 //-----------------------------------------------------------------------------
@@ -28 +29 @@
 // Anything that is resumed is a coroutine.
 trait is_thread(dtype T) {
+      void ^?{}(T* mutex this);
       void main(T* this);
       thread_desc* get_thread(T* this);
 };
 
-#define DECL_THREAD(X) thread_desc* get_thread(X* this) { return &this->t; } void main(X* this)
+#define DECL_THREAD(X) thread_desc* get_thread(X* this) { return &this->__thrd; } void main(X* this)
 
 forall( dtype T | is_thread(T) )
 static inline coroutine_desc* get_coroutine(T* this) {
-        return &get_thread(this)->c;
+        return &get_thread(this)->cor;
 }
 
-static inline coroutine_desc* get_coroutine(thread_desc* this) {
-        return &this->c;
+forall( dtype T | is_thread(T) )
+static inline monitor_desc* get_monitor(T * this) {
+        return &get_thread(this)->mon;
+}
+
+static inline coroutine_desc* get_coroutine(thread_desc * this) {
+        return &this->cor;
+}
+
+static inline monitor_desc* get_monitor(thread_desc * this) {
+        return &this->mon;
 }
 
@@ -64 +75 @@
 void ?{}( scoped(T)* this, P params );
 
-forall( dtype T | sized(T) | is_thread(T) | { void ^?{}(T*); } )
+forall( dtype T | sized(T) | is_thread(T) )
 void ^?{}( scoped(T)* this );