Changes in libcfa/src/concurrency/monitor.cfa [be5f0a5:c18bf9e]

File:

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

libcfa/src/concurrency/monitor.cfa

@@ -122 +122 @@
 
                 // Some one else has the monitor, wait in line for it
-                /* paranoid */ verify( thrd->user_link.next == 0p );
+                /* paranoid */ verify( thrd->link.next == 0p );
                 append( this->entry_queue, thrd );
-                /* paranoid */ verify( thrd->user_link.next == 1p );
+                /* paranoid */ verify( thrd->link.next == 1p );
 
                 unlock( this->lock );
@@ -233 +233 @@
 
                 // Some one else has the monitor, wait in line for it
-                /* paranoid */ verify( thrd->user_link.next == 0p );
+                /* paranoid */ verify( thrd->link.next == 0p );
                 append( this->entry_queue, thrd );
-                /* paranoid */ verify( thrd->user_link.next == 1p );
+                /* paranoid */ verify( thrd->link.next == 1p );
                 unlock( this->lock );
 
@@ -791 +791 @@
         thread$ * new_owner = pop_head( this->entry_queue );
         /* paranoid */ verifyf( !this->owner || active_thread() == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", active_thread(), this->owner, this->recursion, this );
-        /* paranoid */ verify( !new_owner || new_owner->user_link.next == 0p );
+        /* paranoid */ verify( !new_owner || new_owner->link.next == 0p );
         __set_owner( this, new_owner );
 
@@ -935 +935 @@
         __queue_t(thread$) & entry_queue = monitors[0]->entry_queue;
 
-        #if defined( __CFA_WITH_VERIFY__ )
-                thread$ * last = 0p;
-        #endif
         // For each thread in the entry-queue
         for(    thread$ ** thrd_it = &entry_queue.head;
                 (*thrd_it) != 1p;
-                thrd_it = &get_next(**thrd_it)
+                thrd_it = &(*thrd_it)->link.next
         ) {
-                thread$ * curr = *thrd_it;
-
-                /* paranoid */ verifyf( !last || last->user_link.next == curr, "search not making progress, from %p (%p) to %p", last, last->user_link.next, curr );
-                /* paranoid */ verifyf( curr != last, "search not making progress, from %p to %p", last, curr );
-
                 // For each acceptable check if it matches
                 int i = 0;
@@ -954 +946 @@
                 for( __acceptable_t * it = begin; it != end; it++, i++ ) {
                         // Check if we have a match
-                        if( *it == curr->monitors ) {
+                        if( *it == (*thrd_it)->monitors ) {
 
                                 // If we have a match return it
@@ -961 +953 @@
                         }
                 }
-
-                #if defined( __CFA_WITH_VERIFY__ )
-                        last = curr;
-                #endif
         }
 
@@ -1037 +1025 @@
 
                 // Some one else has the monitor, wait in line for it
-                /* paranoid */ verify( thrd->user_link.next == 0p );
+                /* paranoid */ verify( thrd->link.next == 0p );
                 append( this->entry_queue, thrd );
-                /* paranoid */ verify( thrd->user_link.next == 1p );
+                /* paranoid */ verify( thrd->link.next == 1p );
 
                 unlock( this->lock );