Changes in libcfa/src/concurrency/monitor.cfa [1b143de:ae66348]

File:

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

libcfa/src/concurrency/monitor.cfa

@@ -114 +114 @@
 
                 // Some one else has the monitor, wait in line for it
-                /* paranoid */ verify( thrd->link.next == 0p );
+                /* paranoid */ verify( thrd->next == 0p );
                 append( this->entry_queue, thrd );
-                /* paranoid */ verify( thrd->link.next == 1p );
+                /* paranoid */ verify( thrd->next == 1p );
 
                 unlock( this->lock );
@@ -199 +199 @@
 
                 // Some one else has the monitor, wait in line for it
-                /* paranoid */ verify( thrd->link.next == 0p );
+                /* paranoid */ verify( thrd->next == 0p );
                 append( this->entry_queue, thrd );
-                /* paranoid */ verify( thrd->link.next == 1p );
+                /* paranoid */ verify( thrd->next == 1p );
                 unlock( this->lock );
 
@@ -761 +761 @@
         $thread * new_owner = pop_head( this->entry_queue );
         /* paranoid */ verifyf( !this->owner || kernelTLS.this_thread == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", kernelTLS.this_thread, this->owner, this->recursion, this );
-        /* paranoid */ verify( !new_owner || new_owner->link.next == 0p );
+        /* paranoid */ verify( !new_owner || new_owner->next == 0p );
         __set_owner( this, new_owner );
 
@@ -883 +883 @@
         }
 
-        __cfaabi_dbg_print_safe( "Kernel :  Runing %i (%p)\n", ready2run, ready2run ? (thread*)node->waiting_thread : (thread*)0p );
+        __cfaabi_dbg_print_safe( "Kernel :  Runing %i (%p)\n", ready2run, ready2run ? node->waiting_thread : 0p );
         return ready2run ? node->waiting_thread : 0p;
 }
@@ -907 +907 @@
         // For each thread in the entry-queue
         for(    $thread ** thrd_it = &entry_queue.head;
-                (*thrd_it) != 1p;
-                thrd_it = &(*thrd_it)->link.next
+                *thrd_it != 1p;
+                thrd_it = &(*thrd_it)->next
         ) {
                 // For each acceptable check if it matches