Changeset 9b443c7f for src/libcfa/concurrency/thread

Timestamp:

Mar 15, 2017, 5:02:25 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

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:

f2e40a9f

Parents:

5a3ac84 (diff), 29f44a74 (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

File:

• src/libcfa/concurrency/thread (moved) (moved from src/libcfa/concurrency/threads) (3 diffs)

src/libcfa/concurrency/thread ¶

@@ -6 +6 @@
 // file "LICENCE" distributed with Cforall.
 //
-// threads --
+// thread --
 //
 // Author           : Thierry Delisle
@@ -21 +21 @@
 #include "invoke.h"
 
-#include "coroutines"
+#include "coroutine"
 
 //-----------------------------------------------------------------------------
@@ -29 +29 @@
 trait is_thread(dtype T) {
       void main(T* this);
-      thread* get_thread(T* this);
+      thread_desc* get_thread(T* this);
 };
 
-#define DECL_THREAD(X) thread* get_thread(X* this) { return &this->t; } 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* get_coroutine(T* this) {
+static inline coroutine_desc* get_coroutine(T* this) {
         return &get_thread(this)->c;
 }
 
-static inline coroutine* get_coroutine(thread* this) {
+static inline coroutine_desc* get_coroutine(thread_desc* this) {
         return &this->c;
 }
 
-thread * this_thread(void);
+thread_desc * this_thread(void);
 
 //-----------------------------------------------------------------------------
 // Ctors and dtors
-void ?{}(thread* this);
-void ^?{}(thread* this);
+void ?{}(thread_desc* this);
+void ^?{}(thread_desc* this);
 
 //-----------------------------------------------------------------------------