Changeset b110bcc for libcfa/src/concurrency/kernel/startup.cfa

Timestamp:

Apr 21, 2023, 5:36:12 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, master

Children:

28f8f15, 6e4c44d

Parents:

2ed94a9 (diff), 699a97d (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) (3 diffs)

libcfa/src/concurrency/kernel/startup.cfa

@@ -15 +15 @@
 
 #define __cforall_thread__
-#define _GNU_SOURCE
 
 // #define __CFA_DEBUG_PRINT_RUNTIME_CORE__
 
 // C Includes
-#include <errno.h>                                      // errno
+#include <errno.h>                                                                              // errno
 #include <signal.h>
-#include <string.h>                                     // strerror
-#include <unistd.h>                                     // sysconf
-
+#include <string.h>                                                                             // strerror
+#include <unistd.h>
+#include <limits.h>                                                                             // PTHREAD_STACK_MIN
 extern "C" {
-        #include <limits.h>                             // PTHREAD_STACK_MIN
-        #include <unistd.h>                             // syscall
-        #include <sys/eventfd.h>                        // eventfd
-        #include <sys/mman.h>                           // mprotect
-        #include <sys/resource.h>                       // getrlimit
+        #include <sys/eventfd.h>                                                        // eventfd
+        #include <sys/mman.h>                                                           // mprotect
+        #include <sys/resource.h>                                                       // getrlimit
 }
 
@@ -36 +33 @@
 #include "kernel/private.hfa"
 #include "iofwd.hfa"
-#include "startup.hfa"                                  // STARTUP_PRIORITY_XXX
+#include "startup.hfa"                                                                  // STARTUP_PRIORITY_XXX
 #include "limits.hfa"
 #include "math.hfa"
@@ -150 +147 @@
 __scheduler_RWLock_t __scheduler_lock @= { 0 };
 
-#if   defined(CFA_HAVE_LINUX_LIBRSEQ)
-        // No data needed
-#elif defined(CFA_HAVE_LINUX_RSEQ_H)
-        extern "Cforall" {
-                __attribute__((aligned(64))) __thread volatile struct rseq __cfaabi_rseq @= {
-                        .cpu_id : RSEQ_CPU_ID_UNINITIALIZED,
-                };
-        }
-#else
-        // No data needed
-#endif
-
 //-----------------------------------------------------------------------------
 // Struct to steal stack