Changeset a362f97 for src/libcfa/concurrency/threads

Timestamp:

Jan 27, 2017, 3:27:34 PM (9 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:

c0aa336

Parents:

6acb935 (diff), 0a86a30 (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 plg2:software/cfa/cfa-cc

File:

• src/libcfa/concurrency/threads (modified) (1 diff)

src/libcfa/concurrency/threads

@@ -27 +27 @@
 // Anything that implements this trait can be resumed.
 // Anything that is resumed is a coroutine.
-trait is_thread(dtype T /*| sized(T)*/) {
+trait is_thread(dtype T | sized(T)) {
       void main(T* this);
-      thread_h* get_thread(T* this);
-        /*void ?{}(T*);
-        void ^?{}(T*);*/
+      thread* get_thread(T* this);
 };
 
-forall(otype T | is_thread(T) )
+#define DECL_THREAD(X) static inline thread* get_thread(X* this) { return &this->t; } void main(X* this);
+
+forall( dtype T | sized(T) | is_thread(T) )
 static inline coroutine* get_coroutine(T* this) {
         return &get_thread(this)->c;
 }
 
-static inline coroutine* get_coroutine(thread_h* this) {
+static inline coroutine* get_coroutine(thread* this) {
         return &this->c;
 }
 
+thread * this_thread(void);
+
 //-----------------------------------------------------------------------------
 // Ctors and dtors
-void ?{}(thread_h* this);
-void ^?{}(thread_h* this);
+void ?{}(thread* this);
+void ^?{}(thread* this);
 
 //-----------------------------------------------------------------------------
 // thread runner
 // Structure that actually start and stop threads
-forall(otype T | is_thread(T) )
-struct thread {
+forall( dtype T | sized(T) | is_thread(T) )
+struct scoped {
         T handle;
 };
 
-forall(otype T | is_thread(T) )
-void ?{}( thread(T)* this );
+forall( dtype T | sized(T) | is_thread(T) | { void ?{}(T*); } )
+void ?{}( scoped(T)* this );
 
-forall(otype T, ttype P | is_thread(T) | { void ?{}(T*, P); } )
-void ?{}( thread(T)* this, P params );
+forall( dtype T, ttype P | sized(T) | is_thread(T) | { void ?{}(T*, P); } )
+void ?{}( scoped(T)* this, P params );
 
-forall(otype T | is_thread(T) )
-void ^?{}( thread(T)* this );
+forall( dtype T | sized(T) | is_thread(T) | { void ^?{}(T*); } )
+void ^?{}( scoped(T)* this );
 
-//-----------------------------------------------------------------------------
-// PRIVATE exposed because of inline
+void yield();
 
 #endif //THREADS_H