Changeset 660665f for libcfa/src/concurrency/kernel

Timestamp:

Jun 29, 2021, 5:35:19 PM (5 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

dcad80a

Parents:

5a46e09 (diff), d02e547 (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:software/cfa/cfa-cc

File:

• libcfa/src/concurrency/kernel/startup.cfa (modified) (4 diffs)

libcfa/src/concurrency/kernel/startup.cfa

@@ -15 +15 @@
 
 #define __cforall_thread__
+#define _GNU_SOURCE
 
 // C Includes
 #include <errno.h>              // errno
+#include <signal.h>
 #include <string.h>             // strerror
 #include <unistd.h>             // sysconf
+
 extern "C" {
       #include <limits.h>       // PTHREAD_STACK_MIN
+        #include <unistd.h>       // syscall
         #include <sys/eventfd.h>  // eventfd
       #include <sys/mman.h>     // mprotect
@@ -136 +140 @@
 };
 
+#if   defined(CFA_HAVE_LINUX_LIBRSEQ)
+        // No data needed
+#elif defined(CFA_HAVE_LINUX_RSEQ_H)
+        extern "Cforall" {
+                __attribute__((aligned(128))) thread_local volatile struct rseq __cfaabi_rseq @= {
+                        .cpu_id : RSEQ_CPU_ID_UNINITIALIZED,
+                };
+        }
+#else
+        // No data needed
+#endif
+
 //-----------------------------------------------------------------------------
 // Struct to steal stack
@@ -468 +484 @@
         self_mon_p = &self_mon;
         link.next = 0p;
-        link.ts   = 0;
+        link.ts   = -1llu;
         preferred = -1u;
         last_proc = 0p;
@@ -497 +513 @@
         this.rdq.id  = -1u;
         this.rdq.target = -1u;
+        this.rdq.last = -1u;
         this.rdq.cutoff = 0ull;
         do_terminate = false;