Changeset 358cba0 for src/libcfa/concurrency/invoke.h

Timestamp:

May 15, 2018, 4:17:15 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

2e5fa345

Parents:

7d0a3ba (diff), a61fa0bb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

File:

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

src/libcfa/concurrency/invoke.h

@@ -18 +18 @@
 #include "bits/locks.h"
 
-#define TL_GET( member ) kernelThreadData.member
-#define TL_SET( member, value ) kernelThreadData.member = value;
+#define TL_GET( member ) kernelTLS.member
+#define TL_SET( member, value ) kernelTLS.member = value;
 
 #ifdef __cforall
@@ -44 +44 @@
                                 volatile bool in_progress;
                         } preemption_state;
-                } kernelThreadData;
+                } kernelTLS;
         }
 
         static inline struct coroutine_desc * volatile active_coroutine() { return TL_GET( this_coroutine ); }
-        static inline struct thread_desc * volatile active_thread() { return TL_GET( this_thread ); }
-        static inline struct processor * volatile active_processor() { return TL_GET( this_processor ); }
+        static inline struct thread_desc    * volatile active_thread   () { return TL_GET( this_thread    ); }
+        static inline struct processor      * volatile active_processor() { return TL_GET( this_processor ); } // UNSAFE
         #endif
 
@@ -136 +136 @@
                 struct thread_desc * next;
 
-                __cfaabi_dbg_debug_do(
-                        // instrusive link field for debugging
-                        struct thread_desc * dbg_next;
-                        struct thread_desc * dbg_prev;
-                )
+                struct {
+                        struct thread_desc * next;
+                        struct thread_desc * prev;
+                } node;
      };
 
@@ -147 +146 @@
                 static inline thread_desc * & get_next( thread_desc & this ) {
                         return this.next;
+                }
+
+                static inline [thread_desc *&, thread_desc *& ] __get( thread_desc & this ) {
+                        return this.node.[next, prev];
                 }