Changes in src/libcfa/concurrency/monitor.c [169d944:2fdbb3b]

File:

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

src/libcfa/concurrency/monitor.c

@@ -151 +151 @@
                         // We already have the monitor... but where about to destroy it so the nesting will fail
                         // Abort!
-                        abort( "Attempt to destroy monitor %p by thread \"%.256s\" (%p) in nested mutex." );
+                        abort( "Attempt to destroy monitor %p by thread \"%.256s\" (%p) in nested mutex.", this, thrd->self_cor.name, thrd );
                 }
 
@@ -358 +358 @@
 }
 
-void ?{}(__condition_criterion_t & this ) {
-        this.ready  = false;
-        this.target = NULL;
-        this.owner  = NULL;
-        this.next   = NULL;
+void ?{}(__condition_criterion_t & this ) with( this ) {
+        ready  = false;
+        target = NULL;
+        owner  = NULL;
+        next   = NULL;
 }
 
@@ -427 +427 @@
                 thread_desc * this_thrd = this_thread;
                 if ( this.monitor_count != this_thrd->monitors.size ) {
-                        abort( "Signal on condition %p made with different number of monitor(s), expected %i got %i", &this, this.monitor_count, this_thrd->monitors.size );
+                        abort( "Signal on condition %p made with different number of monitor(s), expected %li got %li", &this, this.monitor_count, this_thrd->monitors.size );
                 }
 
                 for(int i = 0; i < this.monitor_count; i++) {
                         if ( this.monitors[i] != this_thrd->monitors[i] ) {
-                                abort( "Signal on condition %p made with different monitor, expected %p got %i", &this, this.monitors[i], this_thrd->monitors[i] );
+                                abort( "Signal on condition %p made with different monitor, expected %p got %p", &this, this.monitors[i], this_thrd->monitors[i] );
                         }
                 }