Changes in libcfa/src/concurrency/invoke.h [ab5baab:e84ab3d]

File:

• libcfa/src/concurrency/invoke.h (modified) (12 diffs)

libcfa/src/concurrency/invoke.h

@@ -20 +20 @@
 
 #ifdef __cforall
+#include "containers/list.hfa"
 extern "C" {
 #endif
@@ -70 +71 @@
         enum __Coroutine_State { Halted, Start, Primed, Blocked, Ready, Active, Cancelled, Halting };
 
-        struct $coroutine {
+        struct coroutine$ {
                 // context that is switch during a __cfactx_switch
                 struct __stack_context_t context;
@@ -84 +85 @@
 
                 // first coroutine to resume this one
-                struct $coroutine * starter;
+                struct coroutine$ * starter;
 
                 // last coroutine to resume this one
-                struct $coroutine * last;
+                struct coroutine$ * last;
 
                 // If non-null stack must be unwound with this exception
@@ -94 +95 @@
         };
         // Wrapper for gdb
-        struct cfathread_coroutine_t { struct $coroutine debug; };
-
-        static inline struct __stack_t * __get_stack( struct $coroutine * cor ) {
+        struct cfathread_coroutine_t { struct coroutine$ debug; };
+
+        static inline struct __stack_t * __get_stack( struct coroutine$ * cor ) {
                 return (struct __stack_t*)(((uintptr_t)cor->stack.storage) & ((uintptr_t)-2));
         }
@@ -109 +110 @@
         };
 
-        struct $monitor {
+        struct monitor$ {
                 // spinlock to protect internal data
                 struct __spinlock_t lock;
 
                 // current owner of the monitor
-                struct $thread * owner;
+                struct thread$ * owner;
 
                 // queue of threads that are blocked waiting for the monitor
-                __queue_t(struct $thread) entry_queue;
+                __queue_t(struct thread$) entry_queue;
 
                 // stack of conditions to run next once we exit the monitor
@@ -132 +133 @@
         };
         // Wrapper for gdb
-        struct cfathread_monitor_t { struct $monitor debug; };
+        struct cfathread_monitor_t { struct monitor$ debug; };
 
         struct __monitor_group_t {
                 // currently held monitors
-                __cfa_anonymous_object( __small_array_t($monitor*) );
+                __cfa_anonymous_object( __small_array_t(monitor$*) );
 
                 // last function that acquired monitors
@@ -145 +146 @@
         // instrusive link field for threads
         struct __thread_desc_link {
-                struct $thread * next;
+                struct thread$ * next;
                 volatile unsigned long long ts;
         };
 
-        struct $thread {
+        struct thread$ {
                 // Core threading fields
                 // context that is switch during a __cfactx_switch
@@ -178 +179 @@
 
                 // coroutine body used to store context
-                struct $coroutine  self_cor;
+                struct coroutine$  self_cor;
 
                 // current active context
-                struct $coroutine * curr_cor;
+                struct coroutine$ * curr_cor;
 
                 // monitor body used for mutual exclusion
-                struct $monitor    self_mon;
+                struct monitor$    self_mon;
 
                 // pointer to monitor with sufficient lifetime for current monitors
-                struct $monitor *  self_mon_p;
+                struct monitor$ *  self_mon_p;
 
                 // monitors currently held by this thread
@@ -194 +195 @@
                 // used to put threads on user data structures
                 struct {
-                        struct $thread * next;
-                        struct $thread * back;
+                        struct thread$ * next;
+                        struct thread$ * back;
                 } seqable;
 
+                // used to put threads on dlist data structure
+                __cfa_dlink(thread$);
+
                 struct {
-                        struct $thread * next;
-                        struct $thread * prev;
+                        struct thread$ * next;
+                        struct thread$ * prev;
                 } node;
 
@@ -209 +213 @@
                 #endif
         };
+        #ifdef __cforall
+                P9_EMBEDDED( thread$, dlink(thread$) )
+        #endif
         // Wrapper for gdb
-        struct cfathread_thread_t { struct $thread debug; };
+        struct cfathread_thread_t { struct thread$ debug; };
 
         #ifdef __CFA_DEBUG__
-                void __cfaabi_dbg_record_thrd($thread & this, bool park, const char prev_name[]);
+                void __cfaabi_dbg_record_thrd(thread$ & this, bool park, const char prev_name[]);
         #else
                 #define __cfaabi_dbg_record_thrd(x, y, z)
@@ -221 +228 @@
         extern "Cforall" {
 
-                static inline $thread *& get_next( $thread & this ) __attribute__((const)) {
+                static inline thread$ *& get_next( thread$ & this ) __attribute__((const)) {
                         return this.link.next;
                 }
 
-                static inline [$thread *&, $thread *& ] __get( $thread & this ) __attribute__((const)) {
+                static inline [thread$ *&, thread$ *& ] __get( thread$ & this ) __attribute__((const)) {
                         return this.node.[next, prev];
                 }
 
-                static inline $thread * volatile & ?`next ( $thread * this )  __attribute__((const)) {
+                static inline thread$ * volatile & ?`next ( thread$ * this )  __attribute__((const)) {
                         return this->seqable.next;
                 }
 
-                static inline $thread *& Back( $thread * this ) __attribute__((const)) {
+                static inline thread$ *& Back( thread$ * this ) __attribute__((const)) {
                         return this->seqable.back;
                 }
 
-                static inline $thread *& Next( $thread * this ) __attribute__((const)) {
-                        return this->seqable.next;
-                }
-
-                static inline bool listed( $thread * this ) {
+                static inline thread$ *& Next( thread$ * this ) __attribute__((const)) {
+                                return this->seqable.next;
+                }
+
+                static inline bool listed( thread$ * this ) {
                         return this->seqable.next != 0p;
                 }
@@ -251 +258 @@
                 }
 
-                static inline void ?{}(__monitor_group_t & this, struct $monitor ** data, __lock_size_t size, fptr_t func) {
+                static inline void ?{}(__monitor_group_t & this, struct monitor$ ** data, __lock_size_t size, fptr_t func) {
                         (this.data){data};
                         (this.size){size};