Changeset 78a580d for libcfa/src/concurrency/kernel

Timestamp:

Mar 22, 2022, 3:28:29 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

ff7b2de

Parents:

8f01ad71

Message:

I/O now updates the timestamps when draining.
Timestamps are not used yet.

Location:

libcfa/src/concurrency/kernel

Files:

• cluster.cfa (modified) (3 diffs)
• cluster.hfa (modified) (2 diffs)
• startup.cfa (modified) (5 diffs)

libcfa/src/concurrency/kernel/cluster.cfa

@@ -27 +27 @@
 
 #include "ready_subqueue.hfa"
+#include "io/types.hfa"
 
 #include <errno.h>
@@ -259 +260 @@
                 it->rdq.id = valrq;
                 it->rdq.target = MAX;
-                it->io.id = valio;
+                it->io.ctx->cq.id = valio;
                 it->io.target = MAX;
                 valrq += __shard_factor.readyq;
@@ -278 +279 @@
         while(it) {
                 /* paranoid */ verifyf( it, "Unexpected null iterator\n");
-                /* paranoid */ verifyf( it->io.id < count, "Processor %p has id %u above count %zu\n", it, it->rdq.id, count);
-                data[it->io.id] = it->io.ctx;
+                /* paranoid */ verifyf( it->io.ctx->cq.id < count, "Processor %p has id %u above count %zu\n", it, it->rdq.id, count);
+                data[it->io.ctx->cq.id] = it->io.ctx;
                 it = &(*it)`next;
         }

libcfa/src/concurrency/kernel/cluster.hfa

@@ -16 +16 @@
 #pragma once
 
+#include "device/cpu.hfa"
 #include "kernel/private.hfa"
+
+#include "limits.hfa"
 
 //-----------------------------------------------------------------------
@@ -31 +34 @@
         const unsigned long long ret = ((new_weight * new_val) + (old_weight * old_avg)) / total_weight;
         return ret;
+}
+
+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;
+        unsigned long long now = rdtscl();
+        unsigned long long pma = __atomic_load_n(&tscs[ idx ].ma, __ATOMIC_RELAXED);
+        __atomic_store_n(&tscs[ idx ].tv, ts_next, __ATOMIC_RELAXED);
+        __atomic_store_n(&tscs[ idx ].ma, moving_average(now, ts_prev, pma), __ATOMIC_RELAXED);
 }
 

libcfa/src/concurrency/kernel/startup.cfa

@@ -233 +233 @@
         /* paranoid */ verify( sizeof(storage_mainIdleEventFd) == sizeof(eventfd_t) );
 
+        __cfa_io_start( mainProcessor );
         register_tls( mainProcessor );
-        __cfa_io_start( mainProcessor );
 
         // Start by initializing the main thread
@@ -314 +314 @@
         mainProcessor->local_data = 0p;
 
+        unregister_tls( mainProcessor );
         __cfa_io_stop( mainProcessor );
-        unregister_tls( mainProcessor );
 
         // Destroy the main processor and its context in reverse order of construction
@@ -364 +364 @@
         proc->local_data = &__cfaabi_tls;
 
+        __cfa_io_start( proc );
         register_tls( proc );
-
-        __cfa_io_start( proc );
 
         // used for idle sleep when io_uring is present
@@ -401 +400 @@
         // Main routine of the core returned, the core is now fully terminated
         __cfadbg_print_safe(runtime_core, "Kernel : core %p main ended (%p)\n", proc, &proc->runner);
-
-        __cfa_io_stop( proc );
 
         #if !defined(__CFA_NO_STATISTICS__)
@@ -417 +414 @@
 
         unregister_tls( proc );
+        __cfa_io_stop( proc );
 
         return 0p;