Changes in libcfa/src/concurrency/ready_subqueue.hfa [d3ba775:353aaba]

File:

• libcfa/src/concurrency/ready_subqueue.hfa (modified) (8 diffs)

libcfa/src/concurrency/ready_subqueue.hfa

@@ -13 +13 @@
 
         __thread_desc_link anchor;
+
+        #if !defined(__CFA_NO_STATISTICS__)
+                unsigned cnt;
+        #endif
 };
 
@@ -29 +33 @@
         this.anchor.next = 0p;
         this.anchor.ts   = 0;
+        #if !defined(__CFA_NO_STATISTICS__)
+                this.cnt  = 0;
+        #endif
 
         // We add a boat-load of assertions here because the anchor code is very fragile
+        /* paranoid */ _Static_assert( offsetof( $thread, link ) == offsetof(__intrusive_lane_t, anchor) );
         /* paranoid */ verify( offsetof( $thread, link ) == offsetof(__intrusive_lane_t, anchor) );
         /* paranoid */ verify( ((uintptr_t)( mock_head(this) ) + offsetof( $thread, link )) == (uintptr_t)(&this.anchor) );
@@ -53 +61 @@
 // Push a thread onto this lane
 // returns true of lane was empty before push, false otherwise
-void push( __intrusive_lane_t & this, $thread * node ) {
+static inline void push( __intrusive_lane_t & this, $thread * node ) {
+        /* paranoid */ verify( this.lock );
         /* paranoid */ verify( node->link.next == 0p );
         /* paranoid */ verify( node->link.ts   == 0  );
@@ -72 +81 @@
         this.prev->link.ts   = rdtscl();
         this.prev = node;
+        #if !defined(__CFA_NO_STATISTICS__)
+                this.cnt++;
+        #endif
 }
 
@@ -77 +89 @@
 // returns popped
 // returns true of lane was empty before push, false otherwise
-$thread * pop( __intrusive_lane_t & this ) {
+static inline [* $thread, unsigned long long] pop( __intrusive_lane_t & this ) {
+        /* paranoid */ verify( this.lock );
         /* paranoid */ verify( this.anchor.next != 0p );
         /* paranoid */ verify( this.anchor.ts   != 0  );
 
         // Get the relevant nodes locally
+        unsigned long long ts = this.anchor.ts;
         $thread * node = this.anchor.next;
         this.anchor.next = node->link.next;
@@ -88 +102 @@
         node->link.next = 0p;
         node->link.ts   = 0;
+        #if !defined(__CFA_NO_STATISTICS__)
+                this.cnt--;
+        #endif
 
         // Update head time stamp
@@ -94 +111 @@
         /* paranoid */ verify( node->link.next == 0p );
         /* paranoid */ verify( node->link.ts   == 0  );
-        return node;
+        return [node, ts];
 }
 
@@ -107 +124 @@
         return this.anchor.ts;
 }
-
-// Aligned timestamps which are used by the relaxed ready queue
-struct __attribute__((aligned(128))) __timestamp_t {
-        volatile unsigned long long tv;
-};
-
-void  ?{}(__timestamp_t & this) { this.tv = 0; }
-void ^?{}(__timestamp_t & this) {}