Changes in libcfa/src/concurrency/kernel/private.hfa [8bee858:cd3fc46]

File:

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

libcfa/src/concurrency/kernel/private.hfa

@@ -184 +184 @@
 // have been hard-coded to for the ready-queue for
 // simplicity and performance
-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;
+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];
 };
 
@@ -205 +210 @@
 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) {
+static inline void ready_schedule_lock(void) with(__scheduler_lock.lock) {
         /* paranoid */ verify( ! __preemption_enabled() );
         /* paranoid */ verify( ! kernelTLS().in_sched_lock );
@@ -235 +240 @@
 }
 
-static inline void ready_schedule_unlock(void) with(*__scheduler_lock) {
+static inline void ready_schedule_unlock(void) with(__scheduler_lock.lock) {
         /* paranoid */ verify( ! __preemption_enabled() );
         /* paranoid */ verify( data[kernelTLS().sched_id] == &kernelTLS().sched_lock );
@@ -256 +261 @@
 
         static inline bool ready_mutate_islocked() {
-                return __scheduler_lock->write_lock;
+                return __scheduler_lock.lock.write_lock;
         }
 #endif