Changeset 2f19e03 for libcfa/src/concurrency

Timestamp:

Jun 15, 2021, 12:28:48 PM (5 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

b51e389c

Parents:

4aba055 (diff), 4f1b8f3f (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' into andrew-mmath, collecting updates.

Location:

libcfa/src/concurrency

Files:

• kernel.cfa (modified) (2 diffs)
• locks.hfa (modified) (3 diffs)

libcfa/src/concurrency/kernel.cfa

@@ -422 +422 @@
                 __cfactx_switch( &proc_cor->context, &thrd_dst->context );
                 // when __cfactx_switch returns we are back in the processor coroutine
+
+
 
                 /* paranoid */ verify( 0x0D15EA5E0D15EA5Ep == thrd_dst->canary );
@@ -522 +524 @@
 
         /* paranoid */ verify( ! __preemption_enabled() );
-        /* paranoid */ verifyf( ((uintptr_t)thrd_src->context.SP) < ((uintptr_t)__get_stack(thrd_src->curr_cor)->base ), "ERROR : Returning $thread %p has been corrupted.\n StackPointer too small.\n", thrd_src );
-        /* paranoid */ verifyf( ((uintptr_t)thrd_src->context.SP) > ((uintptr_t)__get_stack(thrd_src->curr_cor)->limit), "ERROR : Returning $thread %p has been corrupted.\n StackPointer too large.\n", thrd_src );
+        /* paranoid */ verifyf( ((uintptr_t)thrd_src->context.SP) < ((uintptr_t)__get_stack(thrd_src->curr_cor)->base ) || thrd_src->corctx_flag, "ERROR : Returning $thread %p has been corrupted.\n StackPointer too small.\n", thrd_src );
+        /* paranoid */ verifyf( ((uintptr_t)thrd_src->context.SP) > ((uintptr_t)__get_stack(thrd_src->curr_cor)->limit) || thrd_src->corctx_flag, "ERROR : Returning $thread %p has been corrupted.\n StackPointer too large.\n", thrd_src );
 }
 

libcfa/src/concurrency/locks.hfa

@@ -21 +21 @@
 #include "bits/weakso_locks.hfa"
 #include "containers/queueLockFree.hfa"
-
+#include "limits.hfa"
 #include "thread.hfa"
 
@@ -85 +85 @@
         bool tryP(BinaryBenaphore & this) {
                 ssize_t c = this.counter;
+                /* paranoid */ verify( c > MIN );
                 return (c >= 1) && __atomic_compare_exchange_n(&this.counter, &c, c-1, false, __ATOMIC_SEQ_CST, __ATOMIC_RELAXED);
         }
@@ -92 +93 @@
                 ssize_t c = 0;
                 for () {
+                        /* paranoid */ verify( this.counter < MAX );
                         if (__atomic_compare_exchange_n(&this.counter, &c, c+1, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) {
                                 if (c == 0) return true;