Changeset 3ce0c915 for src/libcfa/concurrency/monitor.c

Timestamp:

Feb 2, 2018, 4:00:09 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

d03fa6d

Parents:

11b7028 (diff), d7d4702 (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:/u/cforall/software/cfa/cfa-cc

File:

• src/libcfa/concurrency/monitor.c (modified) (4 diffs)

src/libcfa/concurrency/monitor.c

@@ -87 +87 @@
                 thread_desc * thrd = this_thread;
 
-                verify( disable_preempt_count > 0 );
-
                 __cfaabi_dbg_print_safe("Kernel : %10p Entering mon %p (%p)\n", thrd, this, this->owner);
 
@@ -117 +115 @@
                         // Some one else has the monitor, wait in line for it
                         append( this->entry_queue, thrd );
-
-                        verify( disable_preempt_count > 0 );
 
                         BlockInternal( &this->lock );
@@ -396 +392 @@
         append( this.blocked, &waiter );
 
-        verify( disable_preempt_count == 0 );
-
         // Lock all monitors (aggregates the locks as well)
         lock_all( monitors, locks, count );
-
-        // verifyf( disable_preempt_count == count, "Got %d, expected %d\n", disable_preempt_count, count );
-        if(disable_preempt_count != count) { __cfaabi_dbg_print_buffer_decl("----------Gonna crash\n"); }
 
         // Find the next thread(s) to run
@@ -477 +468 @@
         monitor_ctx( this.monitors, this.monitor_count );
 
-        verify( disable_preempt_count == 0 );
-
         // Lock all monitors (aggregates the locks them as well)
         lock_all( monitors, locks, count );
-
-        // verify( disable_preempt_count == count );
-        if(disable_preempt_count != count) { __cfaabi_dbg_print_buffer_decl("----------Gonna crash\n"); }