Changeset 9d6e1b8a for libcfa/src/concurrency/monitor.cfa

Timestamp:

Nov 17, 2020, 4:29:51 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

3ea8ad1

Parents:

1e208ea

Message:

Minor improvments to assertions and comments

File:

• libcfa/src/concurrency/monitor.cfa (modified) (3 diffs)

libcfa/src/concurrency/monitor.cfa

@@ -166 +166 @@
         }
         // SKULLDUGGERY: join will act as a dtor so it would normally trigger to above check
+        // because join will not release the monitor after it executed.
         // to avoid that it sets the owner to the special value thrd | 1p before exiting
         else if( this->owner == ($thread*)(1 | (uintptr_t)thrd) ) {
@@ -172 +173 @@
 
                 // No one has the monitor, just take it
-                this->owner = thrd;
+                __set_owner( this, thrd );
 
                 verifyf( active_thread() == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", active_thread(), this->owner, this->recursion, this );
@@ -285 +286 @@
 
         // Lock the monitor now
+        /* paranoid */ verify( 0x0D15EA5E0D15EA5Ep == thrd->canary );
         /* paranoid */ verify( this->lock.lock );
+        /* paranoid */ verify( thrd->context.SP );
+        /* paranoid */ verifyf( ((uintptr_t)thrd->context.SP) > ((uintptr_t)__get_stack(thrd->curr_cor)->limit), "ERROR : $thread %p has been corrupted.\n StackPointer too large.\n", thrd );
+        /* paranoid */ verifyf( ((uintptr_t)thrd->context.SP) < ((uintptr_t)__get_stack(thrd->curr_cor)->base ), "ERROR : $thread %p has been corrupted.\n StackPointer too small.\n", thrd );
+        /* paranoid */ verify( ! __preemption_enabled() );
+
         /* paranoid */ verifyf( thrd == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", thrd, this->owner, this->recursion, this );
-        /* paranoid */ verify( ! __preemption_enabled() );
         /* paranoid */ verify( thrd->state == Halted );
         /* paranoid */ verify( this->recursion == 1 );