Changes in / [7f3b5ce:f2ff0a6]

Location:

libcfa/src

Files:

• bits/defs.hfa (modified) (1 diff)
• concurrency/invoke.h (modified) (3 diffs)
• concurrency/kernel.hfa (modified) (1 diff)
• concurrency/kernel/startup.cfa (modified) (4 diffs)
• concurrency/thread.cfa (modified) (1 diff)

libcfa/src/bits/defs.hfa

@@ -31 +31 @@
 #define __cfa_anonymous_object(x) inline struct x
 #define __cfa_dlink1(x) dlink(x)
-#define __cfa_dlink2(x, name) inline struct name { inline dlink(x); }
 #else
 #define __cfa_anonymous_object(x) struct x __cfa_anonymous_object
 #define __cfa_dlink1(x) struct { struct x * next; struct x * back; }
-#define __cfa_dlink2(x, name) struct { struct x * next; struct x * back; } __dlink ## name
 #endif
 

libcfa/src/concurrency/invoke.h

@@ -195 +195 @@
                 struct __monitor_group_t monitors;
 
-                // intrusive link fields, used for locks, monitors and any user defined data structure
-                // default link fields for dlist
+                // used to put threads on dlist data structure
                 __cfa_dlink1(thread$) user_link;
 
-                // secondary intrusive link fields, used for global cluster list
-                // default link fields for dlist
-                __cfa_dlink2(thread$, cltr_link);
+                struct {
+                        struct thread$ * next;
+                        struct thread$ * prev;
+                } node;
 
                 // used to store state between clh lock/unlock
@@ -230 +230 @@
         #ifdef __cforall
         extern "Cforall" {
-                static inline thread$ * volatile & ?`next ( thread$ * this ) {
-                        return this->user_link.next;
-                }
 
                 static inline thread$ *& get_next( thread$ & this ) __attribute__((const)) {
                         return this.user_link.next;
+                }
+
+                static inline [thread$ *&, thread$ *& ] __get( thread$ & this ) __attribute__((const)) {
+                        return this.node.[next, prev];
                 }
 
@@ -243 +244 @@
                         return result;
                 }
-
-                P9_EMBEDDED(thread$, thread$.cltr_link)
-                P9_EMBEDDED(thread$.cltr_link, dlink(thread$))
 
                 static inline void ?{}(__monitor_group_t & this) {

libcfa/src/concurrency/kernel.hfa

@@ -256 +256 @@
         // List of threads
         __spinlock_t thread_list_lock;
-        dlist(struct thread$, thread$.cltr_link) threads;
+        __dllist_t(struct thread$) threads;
         unsigned int nthreads;
 

libcfa/src/concurrency/kernel/startup.cfa

@@ -535 +535 @@
         #endif
 
+        node.next = 0p;
+        node.prev = 0p;
         doregister(curr_cluster, this);
 
@@ -657 +659 @@
         #endif
 
-        threads{};
+        threads{ __get };
 
         io.arbiter = create();
@@ -737 +739 @@
         lock      (cltr->thread_list_lock __cfaabi_dbg_ctx2);
         cltr->nthreads += 1;
-        insert_first(cltr->threads, thrd);
+        push_front(cltr->threads, thrd);
         unlock    (cltr->thread_list_lock);
 }
@@ -743 +745 @@
 void unregister( cluster * cltr, thread$ & thrd ) {
         lock  (cltr->thread_list_lock __cfaabi_dbg_ctx2);
-        {
-                tytagref( dlink(thread$), dlink(thread$) ) ?`inner( thread$ & this ) = void;
-                with( DLINK_VIA( thread$, thread$.cltr_link ) )
-                        remove( thrd );
-                cltr->nthreads -= 1;
-        }
+        remove(cltr->threads, thrd );
+        cltr->nthreads -= 1;
         unlock(cltr->thread_list_lock);
 }

libcfa/src/concurrency/thread.cfa

@@ -54 +54 @@
         #endif
 
+        node.next = 0p;
+        node.prev = 0p;
+
         clh_node = malloc( );
         *clh_node = false;