Changeset 579263a for src/libcfa/concurrency/monitor.c

Timestamp:

Jun 26, 2017, 4:48:35 PM (8 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:

bb1cd95

Parents:

e4d829b (diff), 2a7b3ca (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 designations

Conflicts:

src/InitTweak/FixInit.cc
src/SymTab/Autogen.h
src/SynTree/Initializer.cc
src/SynTree/Initializer.h
src/Tuples/TupleExpansion.cc

File:

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

src/libcfa/concurrency/monitor.c

@@ -56 +56 @@
                 else if( this->owner == thrd) {
                         //We already have the monitor, just not how many times we took it
-                        assert( this->recursion > 0 );
+                        verify( this->recursion > 0 );
                         this->recursion += 1;
                 }
@@ -78 +78 @@
                 lock( &this->lock );
 
-                thread_desc * thrd = this_thread();
-
                 LIB_DEBUG_PRINT_SAFE("%p Leaving %p (o: %p, r: %i)\n", thrd, this, this->owner, this->recursion);
-                assertf( thrd == this->owner, "Expected owner to be %p, got %p (r: %i)", thrd, this->owner, this->recursion );
+                verifyf( this_thread() == this->owner, "Expected owner to be %p, got %p (r: %i)", this_thread(), this->owner, this->recursion );
 
                 //Leaving a recursion level, decrement the counter
@@ -167 +165 @@
         //Check that everything is as expected
         assertf( this->monitors != NULL, "Waiting with no monitors (%p)", this->monitors );
-        assertf( this->monitor_count != 0, "Waiting with 0 monitors (%i)", this->monitor_count );
-        assertf( this->monitor_count < 32u, "Excessive monitor count (%i)", this->monitor_count );
+        verifyf( this->monitor_count != 0, "Waiting with 0 monitors (%i)", this->monitor_count );
+        verifyf( this->monitor_count < 32u, "Excessive monitor count (%i)", this->monitor_count );
 
         unsigned short count = this->monitor_count;
@@ -229 +227 @@
 
         //Check that everything is as expected
-        assert( this->monitors );
-        assert( this->monitor_count != 0 );
+        verify( this->monitors );
+        verify( this->monitor_count != 0 );
 
         unsigned short count = this->monitor_count;
@@ -278 +276 @@
 
         //Check that everything is as expected
-        assertf( this->monitors != NULL, "Waiting with no monitors (%p)", this->monitors );
-        assertf( this->monitor_count != 0, "Waiting with 0 monitors (%i)", this->monitor_count );
+        verifyf( this->monitors != NULL, "Waiting with no monitors (%p)", this->monitors );
+        verifyf( this->monitor_count != 0, "Waiting with 0 monitors (%i)", this->monitor_count );
 
         unsigned short count = this->monitor_count;
@@ -327 +325 @@
 
 uintptr_t front( condition * this ) {
-        LIB_DEBUG_DO(
-                if( is_empty(this) ) {
-                        abortf( "Attempt to access user data on an empty condition.\n"
-                    "Possible cause is not checking if the condition is empty before reading stored data." );
-                }
+        verifyf( !is_empty(this), 
+                "Attempt to access user data on an empty condition.\n"
+                "Possible cause is not checking if the condition is empty before reading stored data."
         );
         return this->blocked.head->user_info;
@@ -491 +487 @@
 
 void append( __condition_blocked_queue_t * this, __condition_node_t * c ) {
-        assert(this->tail != NULL);
+        verify(this->tail != NULL);
         *this->tail = c;
         this->tail = &c->next;