Changeset 7f6a7c9 for libcfa/src/concurrency/kernel/startup.cfa

Timestamp:

Sep 21, 2022, 11:02:15 AM (21 months ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

95dab9e

Parents:

428adbc (diff), 0bd46fd (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' into pthread-emulation

File:

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

libcfa/src/concurrency/kernel/startup.cfa

@@ -113 +113 @@
 KERNEL_STORAGE(thread$,              mainThread);
 KERNEL_STORAGE(__stack_t,            mainThreadCtx);
-KERNEL_STORAGE(__scheduler_RWLock_t, __scheduler_lock);
+// KERNEL_STORAGE(__scheduler_RWLock_t, __scheduler_lock);
 KERNEL_STORAGE(eventfd_t,            mainIdleEventFd);
 KERNEL_STORAGE(io_future_t,          mainIdleFuture);
@@ -123 +123 @@
 processor            * mainProcessor;
 thread$              * mainThread;
-__scheduler_RWLock_t * __scheduler_lock;
 
 extern "C" {
@@ -134 +133 @@
 //-----------------------------------------------------------------------------
 // Global state
-thread_local struct KernelThreadData __cfaabi_tls __attribute__ ((tls_model ( "initial-exec" ))) @= {
+__thread struct KernelThreadData __cfaabi_tls __attribute__ ((tls_model ( "initial-exec" ))) @= {
         NULL,                                                                                           // cannot use 0p
         NULL,
@@ -148 +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_local volatile struct rseq __cfaabi_rseq @= {
+                __attribute__((aligned(64))) __thread volatile struct rseq __cfaabi_rseq @= {
                         .cpu_id : RSEQ_CPU_ID_UNINITIALIZED,
                 };
@@ -198 +199 @@
 
         // Initialize the global scheduler lock
-        __scheduler_lock = (__scheduler_RWLock_t*)&storage___scheduler_lock;
-        (*__scheduler_lock){};
+        // __scheduler_lock = (__scheduler_RWLock_t*)&storage___scheduler_lock;
+        (__scheduler_lock){};
 
         // Initialize the main cluster
@@ -345 +346 @@
         ^(*mainCluster){};
 
-        ^(*__scheduler_lock){};
+        ^(__scheduler_lock){};
 
         ^(__cfa_dbg_global_clusters.list){};