Changeset 708ae38 for libcfa/src/concurrency/kernel

Timestamp:

Mar 15, 2022, 5:11:50 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

9d8124f

Parents:

a552a8c

Message:

Some more cleanup and grow/shrink now readjusts io timestamps.
(They are still unused).

Location:

libcfa/src/concurrency/kernel

Files:

• cluster.cfa (modified) (5 diffs)
• cluster.hfa (added)
• private.hfa (moved) (moved from libcfa/src/concurrency/kernel_private.hfa) (4 diffs)
• startup.cfa (modified) (1 diff)

libcfa/src/concurrency/kernel/cluster.cfa

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// cluster.cfa.cfa -- file that includes helpers for subsystem that need
-//                              cluster wide support
+// cluster.cfa -- file that includes helpers for subsystem that need cluster wide support
 //
 // Author           : Thierry Delisle
-// Created On       : Fri 03 11 12:39:24 2022
+// Created On       : Fri Mar 11 12:39:24 2022
 // Last Modified By :
 // Last Modified On :
@@ -20 +19 @@
 #include "bits/defs.hfa"
 #include "device/cpu.hfa"
-#include "kernel_private.hfa"
+#include "kernel/cluster.hfa"
+#include "kernel/private.hfa"
 
 #include "stdlib.hfa"
@@ -247 +247 @@
 // fixes the list so that the pointers back to anchors aren't left dangling
 static inline void fix(__intrusive_lane_t & ll) {
-                        if(is_empty(ll)) {
-                                verify(ll.anchor.next == 0p);
-                                ll.prev = mock_head(ll);
-                        }
+        if(is_empty(ll)) {
+                verify(ll.anchor.next == 0p);
+                ll.prev = mock_head(ll);
+        }
 }
 
@@ -321 +321 @@
         }
 
+        // Fix the io times
+        cltr->sched.io.count = target;
+        fix_times(cltr->sched.io.tscs, cltr->sched.io.count);
+
         // realloc the caches
         cltr->sched.caches = alloc( target, cltr->sched.caches`realloc );
@@ -406 +410 @@
         cltr->sched.caches = alloc( target, cltr->sched.caches`realloc );
 
-
+        // Fix the io times
+        cltr->sched.io.count = target;
+        fix_times(cltr->sched.io.tscs, cltr->sched.io.count);
 
         reassign_cltr_id(cltr);

libcfa/src/concurrency/kernel/private.hfa

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// kernel_private.hfa --
+// kernel/private.hfa --
 //
 // Author           : Thierry Delisle
@@ -17 +17 @@
 
 #if !defined(__cforall_thread__)
-        #error kernel_private.hfa should only be included in libcfathread source
+        #error kernel/private.hfa should only be included in libcfathread source
 #endif
 
@@ -33 +33 @@
 #else
         #ifndef _GNU_SOURCE
-        #error kernel_private requires gnu_source
+        #error kernel/private requires gnu_source
         #endif
         #include <sched.h>
@@ -369 +369 @@
 void ready_queue_close(struct cluster * cltr);
 
-//-----------------------------------------------------------------------
-// Calc moving average based on existing average, before and current time.
-static inline unsigned long long moving_average(unsigned long long currtsc, unsigned long long instsc, unsigned long long old_avg) {
-        /* paranoid */ verifyf( currtsc < 45000000000000000, "Suspiciously large current time: %'llu (%llx)\n", currtsc, currtsc );
-        /* paranoid */ verifyf( instsc  < 45000000000000000, "Suspiciously large insert time: %'llu (%llx)\n", instsc, instsc );
-        /* paranoid */ verifyf( old_avg < 15000000000000, "Suspiciously large previous average: %'llu (%llx)\n", old_avg, old_avg );
-
-        const unsigned long long new_val = currtsc > instsc ? currtsc - instsc : 0;
-        const unsigned long long total_weight = 16;
-        const unsigned long long new_weight   = 4;
-        const unsigned long long old_weight = total_weight - new_weight;
-        const unsigned long long ret = ((new_weight * new_val) + (old_weight * old_avg)) / total_weight;
-        return ret;
-}
-
-//-----------------------------------------------------------------------
-// Calc age a timestamp should be before needing help.
-forall(Data_t * | { unsigned long long ts(Data_t & this); })
-static inline unsigned long long calc_cutoff(
-        const unsigned long long ctsc,
-        const processor * proc,
-        size_t count,
-        Data_t * data,
-        __timestamp_t * tscs,
-        const unsigned shard_factor
-) {
-        unsigned start = proc->rdq.id;
-        unsigned long long max = 0;
-        for(i; shard_factor) {
-                unsigned long long ptsc = ts(data[start + i]);
-                if(ptsc != -1ull) {
-                        /* paranoid */ verify( start + i < count );
-                        unsigned long long tsc = moving_average(ctsc, ptsc, tscs[start + i].ma);
-                        if(tsc > max) max = tsc;
-                }
-        }
-        return (max + 2 * max) / 2;
-}
-
-static struct {
-        const unsigned readyq;
-} __shard_factor __attribute__((unused)) = { 2 };
-
 // Local Variables: //
 // mode: c //

libcfa/src/concurrency/kernel/startup.cfa

@@ -32 +32 @@
 
 // CFA Includes
-#include "kernel_private.hfa"
+#include "kernel/private.hfa"
 #include "startup.hfa"                                  // STARTUP_PRIORITY_XXX
 #include "limits.hfa"