Changeset ea3fa25 for libcfa/src/concurrency

Timestamp:

Nov 2, 2020, 10:05:40 AM (3 years ago)

Author:

m3zulfiq <m3zulfiq@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

55acc3a, f7136f7

Parents:

45444c3 (diff), 6a036eb (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

Location:

libcfa/src/concurrency

Files:

• invoke.h (modified) (1 diff)
• io/setup.cfa (modified) (1 diff)
• kernel.cfa (modified) (3 diffs)
• kernel/startup.cfa (modified) (1 diff)
• kernel_private.hfa (modified) (1 diff)
• thread.cfa (modified) (1 diff)

libcfa/src/concurrency/invoke.h

@@ -157 +157 @@
 
                 // current execution status for coroutine
+                // Possible values are:
+                //    - TICKET_BLOCKED (-1) thread is blocked
+                //    - TICKET_RUNNING ( 0) thread is running
+                //    - TICKET_UNBLOCK ( 1) thread should ignore next block
                 volatile int ticket;
                 enum __Coroutine_State state:8;

libcfa/src/concurrency/io/setup.cfa

@@ -250 +250 @@
                                         // Fixup the thread state
                                         thrd.state = Blocked;
-                                        thrd.ticket = 0;
+                                        thrd.ticket = TICKET_BLOCKED;
                                         thrd.preempted = __NO_PREEMPTION;
 

libcfa/src/concurrency/kernel.cfa

@@ -299 +299 @@
                 int old_ticket = __atomic_fetch_sub(&thrd_dst->ticket, 1, __ATOMIC_SEQ_CST);
                 switch(old_ticket) {
-                        case 1:
+                        case TICKET_RUNNING:
                                 // This is case 1, the regular case, nothing more is needed
                                 break RUNNING;
-                        case 2:
+                        case TICKET_UNBLOCK:
                                 // This is case 2, the racy case, someone tried to run this thread before it finished blocking
                                 // In this case, just run it again.
@@ -410 +410 @@
         int old_ticket = __atomic_fetch_add(&thrd->ticket, 1, __ATOMIC_SEQ_CST);
         switch(old_ticket) {
-                case 1:
+                case TICKET_RUNNING:
                         // Wake won the race, the thread will reschedule/rerun itself
                         break;
-                case 0:
+                case TICKET_BLOCKED:
                         /* paranoid */ verify( ! thrd->preempted != __NO_PREEMPTION );
                         /* paranoid */ verify( thrd->state == Blocked );
@@ -422 +422 @@
                 default:
                         // This makes no sense, something is wrong abort
-                        abort();
+                        abort("Thread %p (%s) has mismatch park/unpark\n", thrd, thrd->self_cor.name);
         }
 }

libcfa/src/concurrency/kernel/startup.cfa

@@ -441 +441 @@
 
 static void ?{}( $thread & this, current_stack_info_t * info) with( this ) {
-        ticket = 1;
+        ticket = TICKET_RUNNING;
         state = Start;
         self_cor{ info };

libcfa/src/concurrency/kernel_private.hfa

@@ -65 +65 @@
 // KERNEL ONLY unpark with out disabling interrupts
 void __unpark( struct __processor_id_t *, $thread * thrd );
+
+#define TICKET_BLOCKED (-1) // thread is blocked
+#define TICKET_RUNNING ( 0) // thread is running
+#define TICKET_UNBLOCK ( 1) // thread should ignore next block
 
 static inline bool __post(single_sem & this, struct __processor_id_t * id) {

libcfa/src/concurrency/thread.cfa

@@ -29 +29 @@
         context{ 0p, 0p };
         self_cor{ name, storage, storageSize };
-        ticket = 1;
+        ticket = TICKET_RUNNING;
         state = Start;
         preempted = __NO_PREEMPTION;