diff --git a/src/vault/gear/scheduler-commutator.hpp b/src/vault/gear/scheduler-commutator.hpp
index ea54cb449..4d144944a 100644
--- a/src/vault/gear/scheduler-commutator.hpp
+++ b/src/vault/gear/scheduler-commutator.hpp
@@ -262,10 +262,18 @@ namespace gear {
if (decideDispatchNow (event.startTime(), now))
return ActivityLang::dispatchChain (event, executionCtx);
else
- if (holdsGroomingToken (thisThread()))
- layer1.feedPrioritisation (move (event));
- else
- layer1.instruct (move (event));
+ instructFollowUp (event,layer1);
+ return activity::PASS;
+ }
+
+ activity::Proc
+ instructFollowUp (ActivationEvent event
+ ,SchedulerInvocation& layer1 )
+ {
+ if (holdsGroomingToken (thisThread()))
+ layer1.feedPrioritisation (move (event));
+ else
+ layer1.instruct (move (event));
return activity::PASS;
}
};
diff --git a/src/vault/gear/scheduler.hpp b/src/vault/gear/scheduler.hpp
index 6d304a254..8f48cbb63 100644
--- a/src/vault/gear/scheduler.hpp
+++ b/src/vault/gear/scheduler.hpp
@@ -526,8 +526,8 @@ namespace gear {
chainEvent.activity = chain;
chainEvent.starting = _raw(chain->constrainedStart (when));
chainEvent.deadline = _raw(chain->constrainedDeath (dead.isRegular()? dead:chainEvent.deathTime()));
- ExecutionCtx subCtx{scheduler_, chainEvent};
- return scheduler_.layer2_.postDispatch (chainEvent, subCtx, scheduler_.layer1_);
+// ExecutionCtx subCtx{scheduler_, chainEvent};
+ return scheduler_.layer2_.instructFollowUp (chainEvent, scheduler_.layer1_);
}
/**
diff --git a/tests/vault/gear/scheduler-service-test.cpp b/tests/vault/gear/scheduler-service-test.cpp
index 1ceec6410..6d9b3f2c0 100644
--- a/tests/vault/gear/scheduler-service-test.cpp
+++ b/tests/vault/gear/scheduler-service-test.cpp
@@ -583,7 +583,7 @@ SHOW_EXPR(referenceTime)
testLoad.setupSchedule(scheduler)
.withLoadTimeBase(LOAD_BASE)
.withJobDeadline(100ms)
- .requireSchedule()
+// .requireSchedule()
.launch_and_wait();
// invocation through Scheduler has reproduced all node hashes
diff --git a/wiki/thinkPad.ichthyo.mm b/wiki/thinkPad.ichthyo.mm
index fd0ec5fb9..38c51736f 100644
--- a/wiki/thinkPad.ichthyo.mm
+++ b/wiki/thinkPad.ichthyo.mm
@@ -80277,12 +80277,13 @@ Date: Thu Apr 20 18:53:17 2023 +0200
-
+
-
+
+
@@ -80296,6 +80297,12 @@ Date: Thu Apr 20 18:53:17 2023 +0200
+
+
+
+
+
+
@@ -80307,8 +80314,9 @@ Date: Thu Apr 20 18:53:17 2023 +0200