Changeset b035046 for libcfa/src/concurrency

Timestamp:

May 25, 2022, 3:18:21 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

5024df4

Parents:

6dc7011a

Message:

changed some MAX to ULLONG_MAX to avoid the memory access where possible and removed some -1u I missed last time

Location:

libcfa/src/concurrency

Files:

• io.cfa (modified) (3 diffs)
• io/types.hfa (modified) (3 diffs)
• kernel/cluster.cfa (modified) (5 diffs)
• kernel/cluster.hfa (modified) (3 diffs)
• kernel/startup.cfa (modified) (1 diff)
• ready_queue.cfa (modified) (4 diffs)
• ready_subqueue.hfa (modified) (1 diff)
• thread.cfa (modified) (2 diffs)

libcfa/src/concurrency/io.cfa

@@ -221 +221 @@
                         const unsigned long long ctsc = rdtscl();
 
-                        if(proc->io.target == MAX) {
+                        if(proc->io.target == UINT_MAX) {
                                 uint64_t chaos = __tls_rand();
                                 unsigned ext = chaos & 0xff;
@@ -232 +232 @@
                         else {
                                 const unsigned target = proc->io.target;
-                                /* paranoid */ verify( io.tscs[target].tv != MAX );
+                                /* paranoid */ verify( io.tscs[target].tv != ULLONG_MAX );
                                 HELP: if(target < ctxs_count) {
                                         const unsigned long long cutoff = calc_cutoff(ctsc, ctx->cq.id, ctxs_count, io.data, io.tscs, __shard_factor.io);
@@ -246 +246 @@
                                         __STATS__( true, io.calls.helped++; )
                                 }
-                                proc->io.target = MAX;
+                                proc->io.target = UINT_MAX;
                         }
                 }

libcfa/src/concurrency/io/types.hfa

@@ -17 +17 @@
 #pragma once
 
+#include <limits.h>
+
 extern "C" {
         #include <linux/types.h>
@@ -25 +27 @@
 #include "iofwd.hfa"
 #include "kernel/fwd.hfa"
-#include "limits.hfa"
 
 #if defined(CFA_HAVE_LINUX_IO_URING_H)
@@ -140 +141 @@
                 const __u32 tail = *this->cq.tail;
 
-                if(head == tail) return MAX;
+                if(head == tail) return ULLONG_MAX;
 
                 return this->cq.ts;

libcfa/src/concurrency/kernel/cluster.cfa

@@ -233 +233 @@
                                         if(is_empty(sl)) {
                                                 assert( sl.anchor.next == 0p );
-                                                assert( sl.anchor.ts   == -1llu );
+                                                assert( sl.anchor.ts   == MAX );
                                                 assert( mock_head(sl)  == sl.prev );
                                         } else {
                                                 assert( sl.anchor.next != 0p );
-                                                assert( sl.anchor.ts   != -1llu );
+                                                assert( sl.anchor.ts   != MAX );
                                                 assert( mock_head(sl)  != sl.prev );
                                         }
@@ -259 +259 @@
                 /* paranoid */ verifyf( it, "Unexpected null iterator, at index %u of %u\n", i, count);
                 it->rdq.id = valrq;
-                it->rdq.target = MAX;
+                it->rdq.target = UINT_MAX;
                 valrq += __shard_factor.readyq;
                 #if defined(CFA_HAVE_LINUX_IO_URING_H)
                         it->io.ctx->cq.id = valio;
-                        it->io.target = MAX;
+                        it->io.target = UINT_MAX;
                         valio += __shard_factor.io;
                 #endif
@@ -472 +472 @@
         this.prev = mock_head(this);
         this.anchor.next = 0p;
-        this.anchor.ts   = -1llu;
+        this.anchor.ts   = MAX;
         #if !defined(__CFA_NO_STATISTICS__)
                 this.cnt  = 0;
@@ -484 +484 @@
         /* paranoid */ verify( &mock_head(this)->link.ts   == &this.anchor.ts   );
         /* paranoid */ verify( mock_head(this)->link.next == 0p );
-        /* paranoid */ verify( mock_head(this)->link.ts   == -1llu  );
+        /* paranoid */ verify( mock_head(this)->link.ts   == MAX  );
         /* paranoid */ verify( mock_head(this) == this.prev );
         /* paranoid */ verify( __alignof__(__intrusive_lane_t) == 128 );
@@ -495 +495 @@
         // Make sure the list is empty
         /* paranoid */ verify( this.anchor.next == 0p );
-        /* paranoid */ verify( this.anchor.ts   == -1llu );
+        /* paranoid */ verify( this.anchor.ts   == MAX );
         /* paranoid */ verify( mock_head(this)  == this.prev );
 }

libcfa/src/concurrency/kernel/cluster.hfa

@@ -19 +19 @@
 #include "kernel/private.hfa"
 
-#include "limits.hfa"
+#include <limits.h>
 
 //-----------------------------------------------------------------------
@@ -37 +37 @@
 
 static inline void touch_tsc(__timestamp_t * tscs, size_t idx, unsigned long long ts_prev, unsigned long long ts_next) {
-        if (ts_next == MAX) return;
+        if (ts_next == ULLONG_MAX) return;
         unsigned long long now = rdtscl();
         unsigned long long pma = __atomic_load_n(&tscs[ idx ].ma, __ATOMIC_RELAXED);
@@ -59 +59 @@
         for(i; shard_factor) {
                 unsigned long long ptsc = ts(data[start + i]);
-                if(ptsc != -1ull) {
+                if(ptsc != ULLONG_MAX) {
                         /* paranoid */ verify( start + i < count );
                         unsigned long long tsc = moving_average(ctsc, ptsc, tscs[start + i].ma);

libcfa/src/concurrency/kernel/startup.cfa

@@ -507 +507 @@
         self_mon_p = &self_mon;
         link.next = 0p;
-        link.ts   = -1llu;
+        link.ts   = MAX;
         preferred = ready_queue_new_preferred();
         last_proc = 0p;

libcfa/src/concurrency/ready_queue.cfa

@@ -125 +125 @@
         const unsigned long long ctsc = rdtscl();
 
-        if(proc->rdq.target == MAX) {
+        if(proc->rdq.target == UINT_MAX) {
                 uint64_t chaos = __tls_rand();
                 unsigned ext = chaos & 0xff;
@@ -137 +137 @@
                 const unsigned target = proc->rdq.target;
                 __cfadbg_print_safe(ready_queue, "Kernel : %u considering helping %u, tcsc %llu\n", this, target, readyQ.tscs[target].tv);
-                /* paranoid */ verify( readyQ.tscs[target].tv != MAX );
+                /* paranoid */ verify( readyQ.tscs[target].tv != ULLONG_MAX );
                 if(target < lanes_count) {
                         const unsigned long long cutoff = calc_cutoff(ctsc, proc->rdq.id, lanes_count, cltr->sched.readyQ.data, cltr->sched.readyQ.tscs, __shard_factor.readyq);
@@ -147 +147 @@
                         }
                 }
-                proc->rdq.target = MAX;
+                proc->rdq.target = UINT_MAX;
         }
 
@@ -245 +245 @@
 // get preferred ready for new thread
 unsigned ready_queue_new_preferred() {
-        unsigned pref = MAX;
+        unsigned pref = UINT_MAX;
         if(struct thread$ * thrd = publicTLS_get( this_thread )) {
                 pref = thrd->preferred;

libcfa/src/concurrency/ready_subqueue.hfa

@@ -71 +71 @@
         bool is_empty = this.anchor.next == 0p;
         node->link.next = 0p;
-        node->link.ts   = MAX;
+        node->link.ts   = ULLONG_MAX;
         #if !defined(__CFA_NO_STATISTICS__)
                 this.cnt--;

libcfa/src/concurrency/thread.cfa

@@ -19 +19 @@
 #include "thread.hfa"
 
+#include "exception.hfa"
 #include "kernel/private.hfa"
-#include "exception.hfa"
+#include "limits.hfa"
 
 #define __CFA_INVOKE_PRIVATE__
@@ -44 +45 @@
         curr_cluster = &cl;
         link.next = 0p;
-        link.ts   = -1llu;
+        link.ts   = MAX;
         preferred = ready_queue_new_preferred();
         last_proc = 0p;