Changeset d3a804f5 for src/libcfa/concurrency/invoke.h

Timestamp:

Feb 14, 2017, 1:19:28 PM (9 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:

97d246d

Parents:

f923b5f (diff), eafb094 (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/invoke.h (modified) (4 diffs)

src/libcfa/concurrency/invoke.h

@@ -30 +30 @@
       #define SCHEDULER_CAPACITY 10
 
+      struct spinlock {
+            volatile int lock;
+      };
+
       struct simple_thread_list {
             struct thread * head;
             struct thread ** tail;
+      };
+
+      struct signal_once {
+            volatile bool condition;
+            struct spinlock lock;
+            struct simple_thread_list blocked;
       };
 
@@ -40 +50 @@
             void append( struct simple_thread_list *, struct thread * );
             struct thread * pop_head( struct simple_thread_list * );
+
+            void ?{}(spinlock * this);
+            void ^?{}(spinlock * this);
+
+            void ?{}(signal_once * this);
+            void ^?{}(signal_once * this);
       }
       #endif
@@ -53 +69 @@
       };
 
-      enum coroutine_state { Start, Inactive, Active, Halt, Primed };
+      enum coroutine_state { Halted, Start, Inactive, Active, Primed };
 
       struct coroutine {
@@ -60 +76 @@
             int errno_;                         // copy of global UNIX variable errno
             enum coroutine_state state; // current execution status for coroutine
-            bool notHalted;                     // indicate if execuation state is not halted
-
             struct coroutine *starter;  // first coroutine to resume this one
             struct coroutine *last;             // last coroutine to resume this one
       };
 
-      struct simple_lock {
-        struct simple_thread_list blocked;
-      };
-
       struct thread {
-            struct coroutine c;
-            struct simple_lock lock;
-            struct thread * next;
+            struct coroutine c;           // coroutine body used to store context
+            struct signal_once terminated;// indicate if execuation state is not halted
+            struct thread * next;         // instrusive link field for threads
       };