Changeset ee897e4b for src/libcfa

Timestamp:

Feb 13, 2017, 5:13:11 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

eafb094

Parents:

db6f06a

Message:

Made some clean-up and removed redundant coroutine state

Location:

src/libcfa/concurrency

Files:

• coroutines (modified) (3 diffs)
• coroutines.c (modified) (1 diff)
• invoke.c (modified) (1 diff)
• invoke.h (modified) (5 diffs)
• kernel.c (modified) (2 diffs)
• threads.c (modified) (1 diff)

src/libcfa/concurrency/coroutines

@@ -77 +77 @@
                 "Possible cause is a suspend executed in a member called by a coroutine user rather than by the coroutine main.",
                 src->name, src );
-        assertf( src->last->notHalted,
+        assertf( src->last->state != Halted,
                 "Attempt by coroutine \"%.256s\" (%p) to suspend back to terminated coroutine \"%.256s\" (%p).\n"
                 "Possible cause is terminated coroutine's main routine has already returned.",
@@ -98 +98 @@
       // not resuming self ?
         if ( src != dst ) {
-                assertf( dst->notHalted ,
+                assertf( dst->state != Halted ,
                         "Attempt by coroutine %.256s (%p) to resume terminated coroutine %.256s (%p).\n"
                         "Possible cause is terminated coroutine's main routine has already returned.",
@@ -116 +116 @@
       // not resuming self ?
         if ( src != dst ) {
-                assertf( dst->notHalted ,
+                assertf( dst->state != Halted ,
                         "Attempt by coroutine %.256s (%p) to resume terminated coroutine %.256s (%p).\n"
                         "Possible cause is terminated coroutine's main routine has already returned.",

src/libcfa/concurrency/coroutines.c

@@ -68 +68 @@
         this->errno_ = 0;
         this->state = Start;
-        this->notHalted = true;
         this->starter = NULL;
         this->last = NULL;

src/libcfa/concurrency/invoke.c

@@ -48 +48 @@
       main( this );
 
-      cor->state = Halt;
-      cor->notHalted = false;
+      cor->state = Halted;
 
       //Final suspend, should never return

src/libcfa/concurrency/invoke.h

@@ -39 +39 @@
       };
 
-      // struct simple_lock {
-      //        struct simple_thread_list blocked;
-      // };
-
       struct signal_once {
             volatile bool condition;
@@ -54 +50 @@
             void append( struct simple_thread_list *, struct thread * );
             struct thread * pop_head( struct simple_thread_list * );
-
-            // void ?{}(simple_lock * this);
-            // void ^?{}(simple_lock * this);
 
             void ?{}(spinlock * this);
@@ -76 +69 @@
       };
 
-      enum coroutine_state { Start, Inactive, Active, Halt, Primed };
+      enum coroutine_state { Halted, Start, Inactive, Active, Primed };
 
       struct coroutine {
@@ -83 +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
@@ -89 +81 @@
 
       struct thread {
-            struct coroutine c;
-            signal_once terminated;             // indicate if execuation state is not halted
-            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
       };
 

src/libcfa/concurrency/kernel.c

@@ -119 +119 @@
         this->name = "Main Thread";
         this->errno_ = 0;
-        this->state = Inactive;
-        this->notHalted = true;
+        this->state = Start;
 }
 
@@ -287 +286 @@
         proc_cor_storage.c.state = Active;
       main( &proc_cor_storage );
-      proc_cor_storage.c.state = Halt;
-      proc_cor_storage.c.notHalted = false;
+      proc_cor_storage.c.state = Halted;
 
         // Main routine of the core returned, the core is now fully terminated

src/libcfa/concurrency/threads.c

@@ -120 +120 @@
 extern "C" {
         void __thread_signal_termination( thread * this ) {
-                this->c.state = Halt;
+                this->c.state = Halted;
                 LIB_DEBUG_PRINTF("Thread end : %p\n", this);
                 signal( &this->terminated );