Changes in src/libcfa/concurrency/thread [cb0e6de:348006f]

File:

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

src/libcfa/concurrency/thread

@@ -22 +22 @@
 
 #include "coroutine"
-#include "monitor"
 
 //-----------------------------------------------------------------------------
@@ -29 +28 @@
 // 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->__thrd; } void main(X* this)
+#define DECL_THREAD(X) thread_desc* get_thread(X* this) { return &this->t; } void main(X* this)
 
 forall( dtype T | is_thread(T) )
 static inline coroutine_desc* get_coroutine(T* this) {
-        return &get_thread(this)->cor;
+        return &get_thread(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;
+static inline coroutine_desc* get_coroutine(thread_desc* this) {
+        return &this->c;
 }
 
@@ -75 +64 @@
 void ?{}( scoped(T)* this, P params );
 
-forall( dtype T | sized(T) | is_thread(T) )
+forall( dtype T | sized(T) | is_thread(T) | { void ^?{}(T*); } )
 void ^?{}( scoped(T)* this );