Changeset e5d9274 for libcfa/src/concurrency/kernel

Timestamp:

Jun 2, 2022, 3:11:21 PM (4 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

ced5e2a

Parents:

015925a (diff), fc134a48 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

libcfa/src/concurrency/kernel

Files:

• cluster.cfa (modified) (6 diffs)
• cluster.hfa (modified) (3 diffs)
• private.hfa (modified) (1 diff)
• startup.cfa (modified) (9 diffs)

libcfa/src/concurrency/kernel/cluster.cfa

@@ -49 +49 @@
 
 // returns the maximum number of processors the RWLock support
-__attribute__((weak)) unsigned __max_processors() {
+__attribute__((weak)) unsigned __max_processors() libcfa_public {
         const char * max_cores_s = getenv("CFA_MAX_PROCESSORS");
         if(!max_cores_s) {
@@ -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/private.hfa

@@ -109 +109 @@
 //-----------------------------------------------------------------------------
 // Processor
-void main(processorCtx_t *);
+void main(processorCtx_t &);
+static inline coroutine$* get_coroutine(processorCtx_t & this) { return &this.self; }
 
 void * __create_pthread( pthread_t *, void * (*)(void *), void * );

libcfa/src/concurrency/kernel/startup.cfa

@@ -120 +120 @@
 #endif
 
-cluster              * mainCluster;
+cluster              * mainCluster libcfa_public;
 processor            * mainProcessor;
 thread$              * mainThread;
@@ -169 +169 @@
 };
 
-void ?{}( current_stack_info_t & this ) {
+static void ?{}( current_stack_info_t & this ) {
         __stack_context_t ctx;
         CtxGet( ctx );
@@ -209 +209 @@
         // Construct the processor context of the main processor
         void ?{}(processorCtx_t & this, processor * proc) {
-                (this.__cor){ "Processor" };
-                this.__cor.starter = 0p;
+                (this.self){ "Processor" };
+                this.self.starter = 0p;
                 this.proc = proc;
         }
@@ -507 +507 @@
         self_mon_p = &self_mon;
         link.next = 0p;
-        link.ts   = -1llu;
+        link.ts   = MAX;
         preferred = ready_queue_new_preferred();
         last_proc = 0p;
@@ -526 +526 @@
 // Construct the processor context of non-main processors
 static void ?{}(processorCtx_t & this, processor * proc, current_stack_info_t * info) {
-        (this.__cor){ info };
+        (this.self){ info };
         this.proc = proc;
 }
@@ -578 +578 @@
 }
 
-void ?{}(processor & this, const char name[], cluster & _cltr, thread$ * initT) {
+void ?{}(processor & this, const char name[], cluster & _cltr, thread$ * initT) libcfa_public {
         ( this.terminated ){};
         ( this.runner ){};
@@ -591 +591 @@
 }
 
-void ?{}(processor & this, const char name[], cluster & _cltr) {
+void ?{}(processor & this, const char name[], cluster & _cltr) libcfa_public {
         (this){name, _cltr, 0p};
 }
 
 extern size_t __page_size;
-void ^?{}(processor & this) with( this ){
+void ^?{}(processor & this) libcfa_public with( this ) {
         /* paranoid */ verify( !__atomic_load_n(&do_terminate, __ATOMIC_ACQUIRE) );
         __cfadbg_print_safe(runtime_core, "Kernel : core %p signaling termination\n", &this);
@@ -623 +623 @@
 }
 
-void ?{}(cluster & this, const char name[], Duration preemption_rate, unsigned num_io, const io_context_params & io_params) with( this ) {
+void ?{}(cluster & this, const char name[], Duration preemption_rate, unsigned num_io, const io_context_params & io_params) libcfa_public with( this ) {
         this.name = name;
         this.preemption_rate = preemption_rate;
@@ -658 +658 @@
 }
 
-void ^?{}(cluster & this) {
+void ^?{}(cluster & this) libcfa_public {
         destroy(this.io.arbiter);