Changes in src/libcfa/concurrency/monitor.c [4aa2fb2:c81ebf9]

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
-                        verify( this->recursion > 0 );
+                        assert( 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);
-                verifyf( this_thread() == this->owner, "Expected owner to be %p, got %p (r: %i)", this_thread(), this->owner, this->recursion );
+                assertf( thrd == this->owner, "Expected owner to be %p, got %p (r: %i)", thrd, this->owner, this->recursion );
 
                 //Leaving a recursion level, decrement the counter
@@ -165 +167 @@
         //Check that everything is as expected
         assertf( this->monitors != NULL, "Waiting with no monitors (%p)", this->monitors );
-        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 );
+        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 );
 
         unsigned short count = this->monitor_count;
@@ -227 +229 @@
 
         //Check that everything is as expected
-        verify( this->monitors );
-        verify( this->monitor_count != 0 );
+        assert( this->monitors );
+        assert( this->monitor_count != 0 );
 
         unsigned short count = this->monitor_count;
@@ -276 +278 @@
 
         //Check that everything is as expected
-        verifyf( this->monitors != NULL, "Waiting with no monitors (%p)", this->monitors );
-        verifyf( this->monitor_count != 0, "Waiting with 0 monitors (%i)", this->monitor_count );
+        assertf( this->monitors != NULL, "Waiting with no monitors (%p)", this->monitors );
+        assertf( this->monitor_count != 0, "Waiting with 0 monitors (%i)", this->monitor_count );
 
         unsigned short count = this->monitor_count;
@@ -325 +327 @@
 
 uintptr_t front( condition * this ) {
-        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."
+        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." );
+                }
         );
         return this->blocked.head->user_info;
@@ -487 +491 @@
 
 void append( __condition_blocked_queue_t * this, __condition_node_t * c ) {
-        verify(this->tail != NULL);
+        assert(this->tail != NULL);
         *this->tail = c;
         this->tail = &c->next;