Changes in libcfa/src/concurrency/monitor.cfa [2026bb6:09f357ec]

File:

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

libcfa/src/concurrency/monitor.cfa

@@ -10 +10 @@
 // Created On       : Thd Feb 23 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 30 14:30:26 2018
-// Update Count     : 9
+// Last Modified On : Wed Dec  4 07:55:14 2019
+// Update Count     : 10
 //
 
@@ -243 +243 @@
         // last routine called by a thread.
         // Should never return
-        void __leave_thread_monitor( thread_desc * thrd ) {
+        void __leave_thread_monitor() {
+                thread_desc * thrd = TL_GET( this_thread );
                 monitor_desc * this = &thrd->self_mon;
 
@@ -363 +364 @@
         this.waiting_thread = waiting_thread;
         this.count = count;
-        this.next = NULL;
+        this.next = 0p;
         this.user_info = user_info;
 }
@@ -369 +370 @@
 void ?{}(__condition_criterion_t & this ) with( this ) {
         ready  = false;
-        target = NULL;
-        owner  = NULL;
-        next   = NULL;
+        target = 0p;
+        owner  = 0p;
+        next   = 0p;
 }
 
@@ -378 +379 @@
         this.target = target;
         this.owner  = &owner;
-        this.next   = NULL;
+        this.next   = 0p;
 }
 
@@ -387 +388 @@
 
         // Check that everything is as expected
-        assertf( this.monitors != NULL, "Waiting with no monitors (%p)", this.monitors );
+        assertf( this.monitors != 0p, "Waiting with no monitors (%p)", this.monitors );
         verifyf( this.monitor_count != 0, "Waiting with 0 monitors (%"PRIiFAST16")", this.monitor_count );
         verifyf( this.monitor_count < 32u, "Excessive monitor count (%"PRIiFAST16")", this.monitor_count );
@@ -449 +450 @@
 
         // Lock all monitors
-        lock_all( this.monitors, NULL, count );
+        lock_all( this.monitors, 0p, count );
 
         //Pop the head of the waiting queue
@@ -471 +472 @@
 
         //Check that everything is as expected
-        verifyf( this.monitors != NULL, "Waiting with no monitors (%p)", this.monitors );
+        verifyf( this.monitors != 0p, "Waiting with no monitors (%p)", this.monitors );
         verifyf( this.monitor_count != 0, "Waiting with 0 monitors (%"PRIiFAST16")", this.monitor_count );
 
@@ -674 +675 @@
 
 static inline void reset_mask( monitor_desc * this ) {
-        this->mask.accepted = NULL;
-        this->mask.data = NULL;
+        this->mask.accepted = 0p;
+        this->mask.data = 0p;
         this->mask.size = 0;
 }
@@ -816 +817 @@
         }
 
-        __cfaabi_dbg_print_safe( "Kernel :  Runing %i (%p)\n", ready2run, ready2run ? node->waiting_thread : NULL );
-        return ready2run ? node->waiting_thread : NULL;
+        __cfaabi_dbg_print_safe( "Kernel :  Runing %i (%p)\n", ready2run, ready2run ? node->waiting_thread : 0p );
+        return ready2run ? node->waiting_thread : 0p;
 }
 
@@ -824 +825 @@
         if( !this.monitors ) {
                 // __cfaabi_dbg_print_safe( "Branding\n" );
-                assertf( thrd->monitors.data != NULL, "No current monitor to brand condition %p", thrd->monitors.data );
+                assertf( thrd->monitors.data != 0p, "No current monitor to brand condition %p", thrd->monitors.data );
                 this.monitor_count = thrd->monitors.size;