Changes in libcfa/src/concurrency/kernel/private.hfa [2284d20:2af1943]

File:

• libcfa/src/concurrency/kernel/private.hfa (modified) (9 diffs)

libcfa/src/concurrency/kernel/private.hfa

@@ -88 +88 @@
 #elif defined(CFA_HAVE_LINUX_RSEQ_H)
         extern "Cforall" {
-                extern __attribute__((aligned(64))) __thread volatile struct rseq __cfaabi_rseq;
+                extern __attribute__((aligned(64))) thread_local volatile struct rseq __cfaabi_rseq;
         }
 #else
@@ -139 +139 @@
 //-----------------------------------------------------------------------------
 // I/O
-io_arbiter$ * create(void);
-void destroy(io_arbiter$ *);
+$io_arbiter * create(void);
+void destroy($io_arbiter *);
 
 //=======================================================================
@@ -161 +161 @@
 // Blocking acquire
 static inline void __atomic_acquire(volatile bool * ll) {
-        /* paranoid */ verify( ! __preemption_enabled() );
-        /* paranoid */ verify(ll);
-
         while( __builtin_expect(__atomic_exchange_n(ll, (bool)true, __ATOMIC_SEQ_CST), false) ) {
                 while(__atomic_load_n(ll, (int)__ATOMIC_RELAXED))
@@ -169 +166 @@
         }
         /* paranoid */ verify(*ll);
-        /* paranoid */ verify( ! __preemption_enabled() );
 }
 
 // Non-Blocking acquire
 static inline bool __atomic_try_acquire(volatile bool * ll) {
-        /* paranoid */ verify( ! __preemption_enabled() );
-        /* paranoid */ verify(ll);
-
         return !__atomic_exchange_n(ll, (bool)true, __ATOMIC_SEQ_CST);
 }
@@ -182 +175 @@
 // Release
 static inline void __atomic_unlock(volatile bool * ll) {
-        /* paranoid */ verify( ! __preemption_enabled() );
-        /* paranoid */ verify(ll);
         /* paranoid */ verify(*ll);
         __atomic_store_n(ll, (bool)false, __ATOMIC_RELEASE);
@@ -193 +184 @@
 // have been hard-coded to for the ready-queue for
 // simplicity and performance
-union __attribute__((aligned(64))) __scheduler_RWLock_t {
-        struct {
-                __attribute__((aligned(64))) char padding;
-
-                // total cachelines allocated
-                __attribute__((aligned(64))) unsigned int max;
-
-                // cachelines currently in use
-                volatile unsigned int alloc;
-
-                // cachelines ready to itereate over
-                // (!= to alloc when thread is in second half of doregister)
-                volatile unsigned int ready;
-
-                // writer lock
-                volatile bool write_lock;
-
-                // data pointer
-                volatile bool * volatile * data;
-        } lock;
-        char pad[192];
+struct __scheduler_RWLock_t {
+        // total cachelines allocated
+        unsigned int max;
+
+        // cachelines currently in use
+        volatile unsigned int alloc;
+
+        // cachelines ready to itereate over
+        // (!= to alloc when thread is in second half of doregister)
+        volatile unsigned int ready;
+
+        // writer lock
+        volatile bool write_lock;
+
+        // data pointer
+        volatile bool * volatile * data;
 };
 
@@ -219 +205 @@
 void ^?{}(__scheduler_RWLock_t & this);
 
-extern __scheduler_RWLock_t __scheduler_lock;
+extern __scheduler_RWLock_t * __scheduler_lock;
 
 //-----------------------------------------------------------------------
 // Reader side : acquire when using the ready queue to schedule but not
 //  creating/destroying queues
-static inline void ready_schedule_lock(void) with(__scheduler_lock.lock) {
+static inline void ready_schedule_lock(void) with(*__scheduler_lock) {
         /* paranoid */ verify( ! __preemption_enabled() );
         /* paranoid */ verify( ! kernelTLS().in_sched_lock );
@@ -249 +235 @@
 }
 
-static inline void ready_schedule_unlock(void) with(__scheduler_lock.lock) {
+static inline void ready_schedule_unlock(void) with(*__scheduler_lock) {
         /* paranoid */ verify( ! __preemption_enabled() );
         /* paranoid */ verify( data[kernelTLS().sched_id] == &kernelTLS().sched_lock );
@@ -270 +256 @@
 
         static inline bool ready_mutate_islocked() {
-                return __scheduler_lock.lock.write_lock;
+                return __scheduler_lock->write_lock;
         }
 #endif