Changes in libcfa/src/concurrency/kernel/startup.cfa [1bcbf02:b035046]

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" {
@@ -133 +134 @@
 //-----------------------------------------------------------------------------
 // Global state
-__thread struct KernelThreadData __cfaabi_tls __attribute__ ((tls_model ( "initial-exec" ))) @= {
+thread_local struct KernelThreadData __cfaabi_tls __attribute__ ((tls_model ( "initial-exec" ))) @= {
         NULL,                                                                                           // cannot use 0p
         NULL,
@@ -147 +148 @@
 };
 
-__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 @= {
+                __attribute__((aligned(128))) thread_local volatile struct rseq __cfaabi_rseq @= {
                         .cpu_id : RSEQ_CPU_ID_UNINITIALIZED,
                 };
@@ -199 +198 @@
 
         // 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
@@ -337 +336 @@
         ^(*mainCluster){};
 
-        ^(__scheduler_lock){};
+        ^(*__scheduler_lock){};
 
         ^(__cfa_dbg_global_clusters.list){};