Changes in libcfa/src/concurrency/locks.cfa [d25b2d6:4aeaee5]

File:

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

libcfa/src/concurrency/locks.cfa

@@ -29 +29 @@
 
         void ^?{}( info_thread(L) & this ){ }
-
-        info_thread(L) *& Back( info_thread(L) * this ) {
-                return (info_thread(L) *)Back( (Seqable *)this );
-        }
-
-        info_thread(L) *& Next( info_thread(L) * this ) {
-                return (info_thread(L) *)Next( (Colable *)this );
-        }
-
-        bool listed( info_thread(L) * this ) {
-                return Next( (Colable *)this ) != 0p;
-        }
 }
 
@@ -70 +58 @@
                 abort("A single acquisition lock holder attempted to reacquire the lock resulting in a deadlock.");
         } else if ( owner != 0p && owner != active_thread() ) {
-                addTail( blocked_threads, *active_thread() );
+                append( blocked_threads, active_thread() );
                 wait_count++;
                 unlock( lock );
@@ -108 +96 @@
 
 void pop_and_set_new_owner( blocking_lock & this ) with( this ) {
-        $thread * t = &dropHead( blocked_threads );
+        $thread * t = pop_head( blocked_threads );
         owner = t;
         recursion_count = ( t ? 1 : 0 );
@@ -140 +128 @@
     lock( lock __cfaabi_dbg_ctx2 );
         if ( owner != 0p ) {
-                addTail( blocked_threads, *t );
+                append( blocked_threads, t );
                 wait_count++;
                 unlock( lock );
@@ -269 +257 @@
                 size_t recursion_count = 0;
                 if (i->lock) {
+                        i->t->link.next = 1p;
                         recursion_count = get_recursion_count(*i->lock);
                         remove_( *i->lock );