Changes in / [bae0d35:53692b3]

Location:

libcfa/src

Files:

• bits/defs.hfa (modified) (1 diff)
• bits/weakso_locks.hfa (modified) (2 diffs)
• concurrency/invoke.h (modified) (4 diffs)
• concurrency/locks.cfa (modified) (11 diffs)
• concurrency/locks.hfa (modified) (4 diffs)

libcfa/src/bits/defs.hfa

@@ -31 +31 @@
 #ifdef __cforall
 #define __cfa_anonymous_object(x) inline struct x
-#define __cfa_dlink(x) inline dlink(x)
 #else
 #define __cfa_anonymous_object(x) struct x __cfa_anonymous_object
-#define __cfa_dlink(x) struct { struct x * next; struct x * back; } __dlink_substitute
 #endif
 

libcfa/src/bits/weakso_locks.hfa

@@ -21 +21 @@
 #include "bits/sequence.hfa"
 #include "bits/containers.hfa"
-#include "containers/list.hfa"
 
 struct $thread;
@@ -32 +31 @@
 
         // List of blocked threads
-        dlist( $thread ) blocked_threads;
+        Sequence( $thread ) blocked_threads;
 
         // Count of current blocked threads

libcfa/src/concurrency/invoke.h

@@ -20 +20 @@
 
 #ifdef __cforall
-#include "containers/list.hfa"
 extern "C" {
 #endif
@@ -199 +198 @@
                 } seqable;
 
-                // used to put threads on dlist data structure
-                __cfa_dlink($thread);
-
                 struct {
                         struct $thread * next;
@@ -213 +209 @@
                 #endif
         };
-        #ifdef __cforall
-                P9_EMBEDDED( $thread, dlink($thread) )
-        #endif
         // Wrapper for gdb
         struct cfathread_thread_t { struct $thread debug; };
@@ -245 +238 @@
 
                 static inline $thread *& Next( $thread * this ) __attribute__((const)) {
-                                return this->seqable.next;
+                        return this->seqable.next;
                 }
 

libcfa/src/concurrency/locks.cfa

@@ -27 +27 @@
 forall(L & | is_blocking_lock(L)) {
         struct info_thread {
-                // used to put info_thread on a dl queue
-                inline dlink(info_thread(L));
+                // used to put info_thread on a dl queue (aka sequence)
+                inline Seqable;
 
                 // waiting thread
@@ -42 +42 @@
                 bool signalled;
         };
-        P9_EMBEDDED( info_thread(L), dlink(info_thread(L)) )
 
         void ?{}( info_thread(L) & this, $thread * t, uintptr_t info, L * l ) {
+                ((Seqable &) this){};
                 this.t = t;
                 this.info = info;
@@ -51 +51 @@
 
         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 );
+        }
 }
 
@@ -77 +85 @@
         // lock is held by some other thread
         if ( owner != 0p && owner != thrd ) {
-                insert_last( blocked_threads, *thrd );
+                addTail( blocked_threads, *thrd );
                 wait_count++;
                 unlock( lock );
@@ -116 +124 @@
 
 void pop_and_set_new_owner( blocking_lock & this ) with( this ) {
-        $thread * t = &try_pop_front( blocked_threads );
+        $thread * t = &dropHead( blocked_threads );
         owner = t;
         recursion_count = ( t ? 1 : 0 );
@@ -145 +153 @@
         // lock held
         if ( owner != 0p ) {
-                insert_last( blocked_threads, *t );
+                addTail( blocked_threads, *t );
                 wait_count++;
                 unlock( lock );
@@ -198 +206 @@
                 //      may still be called after a thread has been removed from the queue but
                 //      before the alarm is unregistered
-                if ( (*info_thd)`isListed ) {   // is thread on queue
+                if ( listed(info_thd) ) {       // is thread on queue
                         info_thd->signalled = false;
                         // remove this thread O(1)
-                        remove( *info_thd );
+                        remove( cond->blocked_threads, *info_thd );
                         cond->count--;
                         if( info_thd->lock ) {
@@ -246 +254 @@
         bool notify_one( condition_variable(L) & this ) with( this ) {
                 lock( lock __cfaabi_dbg_ctx2 );
-                bool ret = ! blocked_threads`isEmpty;
-                process_popped(this, try_pop_front( blocked_threads ));
+                bool ret = !empty(blocked_threads);
+                process_popped(this, dropHead( blocked_threads ));
                 unlock( lock );
                 return ret;
@@ -254 +262 @@
         bool notify_all( condition_variable(L) & this ) with(this) {
                 lock( lock __cfaabi_dbg_ctx2 );
-                bool ret = ! blocked_threads`isEmpty;
-                while( ! blocked_threads`isEmpty ) {
-                        process_popped(this, try_pop_front( blocked_threads ));
+                bool ret = !empty(blocked_threads);
+                while( !empty(blocked_threads) ) {
+                        process_popped(this, dropHead( blocked_threads ));
                 }
                 unlock( lock );
@@ -263 +271 @@
 
         uintptr_t front( condition_variable(L) & this ) with(this) {
-                return blocked_threads`isEmpty ? NULL : blocked_threads`first.info;
+                return empty(blocked_threads) ? NULL : head(blocked_threads).info;
         }
 
         bool empty( condition_variable(L) & this ) with(this) {
                 lock( lock __cfaabi_dbg_ctx2 );
-                bool ret = blocked_threads`isEmpty;
+                bool ret = empty(blocked_threads);
                 unlock( lock );
                 return ret;
@@ -277 +285 @@
         size_t queue_and_get_recursion( condition_variable(L) & this, info_thread(L) * i ) with(this) {
                 // add info_thread to waiting queue
-                insert_last( blocked_threads, *i );
+                addTail( blocked_threads, *i );
                 count++;
                 size_t recursion_count = 0;

libcfa/src/concurrency/locks.hfa

@@ -21 +21 @@
 #include "bits/weakso_locks.hfa"
 #include "containers/queueLockFree.hfa"
-#include "containers/list.hfa"
 
 #include "thread.hfa"
@@ -41 +40 @@
 
 static inline bool P(Semaphore0nary & this, $thread * thrd) {
-        /* paranoid */ verify(!thrd`next);
-        /* paranoid */ verify(!(&(*thrd)`next));
+        /* paranoid */ verify(!(thrd->seqable.next));
+        /* paranoid */ verify(!(thrd`next));
 
         push(this.queue, thrd);
@@ -251 +250 @@
 
 //-----------------------------------------------------------------------------
-// // info_thread
-// // the info thread is a wrapper around a thread used
-// // to store extra data for use in the condition variable
+// info_thread
+// the info thread is a wrapper around a thread used
+// to store extra data for use in the condition variable
 forall(L & | is_blocking_lock(L)) {
         struct info_thread;
 
-        // // for use by sequence
-        // info_thread(L) *& Back( info_thread(L) * this );
-        // info_thread(L) *& Next( info_thread(L) * this );
+        // for use by sequence
+        info_thread(L) *& Back( info_thread(L) * this );
+        info_thread(L) *& Next( info_thread(L) * this );
 }
 
@@ -270 +269 @@
 
                 // List of blocked threads
-                dlist( info_thread(L) ) blocked_threads;
+                Sequence( info_thread(L) ) blocked_threads;
 
                 // Count of current blocked threads
                 int count;
         };
-        
 
         void  ?{}( condition_variable(L) & this );