ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Activity-Lang: cover all cases of Gate-behaviour

Browse source 
TODO: while correct as implemented, the handling of the
notification seems questionable, since re-scheduling the chain immediately
may lead to multiple invocations of the chain, since it might have been "spinned"
and thus re-scheduled already, and we have no way to find out about that
This commit is contained in:
Fischlurch 2023-08-22 20:13:13 +02:00
parent f1a446d85c
commit 2f042ce6c0
5 changed files with 143 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/vault/gear/activity.hpp
View file

@ -503,7 +503,7 @@ namespace gear {
--data_.condition.rest;
// maybe the Gate has been opened by this notification?
if (data_.condition.isFree(now)) // yes => activate gated chain
return postChain (now, executionCtx);
return postChain (now, executionCtx); ////////////////////////////////////////////////////////TICKET #1319 : really re-scheduler directly? may lead to duplicate invocations!
else
return activity::PASS;
}
@ -519,7 +519,8 @@ namespace gear {
activity::Proc
dispatchSelfDelayed (Time now, EXE& executionCtx)
{
return dispatchSelf (executionCtx.spin(now), executionCtx);
dispatchSelf (executionCtx.spin(now), executionCtx);
return activity::SKIP;
}
template<class EXE>
@ -569,7 +570,7 @@ namespace gear {
* @return activity::Proc indication how to proceed with execution
* - activity::PASS continue with regular processing of `next`
* - activity::SKIP ignore the rest of the chain, look for new work
* - activity::KILL abort this complete Activity term (timeout)
* - activity::KILL abort this complete Activity term (play change)
* - activity::HALT serious problem, stop the Scheduler
*/
template<class EXE>

16
tests/vault/gear/activity-detector-test.cpp
View file

@ -113,11 +113,11 @@ namespace test {
auto fun = detector.buildDiagnosticFun<void(uint)> ("funny");
uint rnd = rand() % 10000;
++detector;
detector.incrementSeq();
CHECK (1 == detector.currSeq());
CHECK (detector.ensureNoInvocation ("funny"));
++detector;
detector.incrementSeq();
CHECK (2 == detector.currSeq());
CHECK (detector.verifySeqIncrement(2));
@ -133,7 +133,7 @@ namespace test {
CHECK (detector.ensureNoInvocation ("funny").seq(5)); // expecting wrong sequence number
CHECK (detector.ensureNoInvocation ("funny").arg(rnd).seq(1)); // expecting correct argument, but wrong sequence
++detector;
detector.incrementSeq();
fun (rnd+1);
CHECK (detector.verifyInvocation ("funny").seq(2)
.beforeSeqIncrement(3)
@ -174,7 +174,7 @@ namespace test {
CHECK (detector.verifyInvocation ("mockJob").arg(nominal, invoKey.part.a));
CHECK (detector.verifyInvocation ("mockJob").timeArg(nominal));
++detector; // note: sequence number incremented between invocations
detector.incrementSeq(); // note: sequence number incremented between invocations
dummyJob.parameter.nominalTime += 5 * Time::SCALE; // different job parameter (later nominal time point)
dummyJob.triggerJob();
@ -221,7 +221,7 @@ namespace test {
CHECK (activity::PASS == ctx.tick(t));
CHECK (detector.verifyInvocation(CTX_TICK).arg(t));
++detector;
detector.incrementSeq();
ctx.tick.returning(activity::KILL);
CHECK (activity::KILL == ctx.tick(t));
CHECK (detector.verifyInvocation(CTX_TICK).timeArg(t));
@ -277,7 +277,7 @@ namespace test {
Activity& tap = detector.buildActivationTap (invoke);
CHECK (tap.next == invoke.next);
++detector;
detector.incrementSeq();
Time t2{0,2,2};
// now activate through the Tap....
tap.activate(t2, detector.executionCtx);
@ -286,7 +286,7 @@ namespace test {
.beforeInvocation(jobID).seq(1).arg(nomTime,12));
// WARNING: can still activate the watched subject directly...
++detector;
detector.incrementSeq();
Time t3{0,3,3};
invoke.activate (t3, detector.executionCtx);
CHECK (detector.verifyInvocation(jobID).seq(2)); // subject invoked
@ -384,7 +384,7 @@ namespace test {
Time tt{5,5};
wiring->activate(tt, detector.executionCtx);
++detector;
detector.incrementSeq();
wiring->next->activate(tt, detector.executionCtx);
CHECK (detector.verifyInvocation("tap-GATE").seq(0).timeArg(tt)

2
tests/vault/gear/activity-detector.hpp
View file

@ -464,7 +464,7 @@ namespace test {
/** increment the internal invocation sequence number */
uint
operator++()
incrementSeq()
{
++invocationSeq_;
eventLog_.event (MARK_INC, util::toString(invocationSeq_));

84
tests/vault/gear/scheduler-activity-test.cpp
View file

@ -161,11 +161,10 @@ namespace test {
/** @test TODO behaviour of Activity::NOTIFY
/** @test behaviour of Activity::NOTIFY when _activated_
* - notification is dispatched as special message to an indicated target Activity
* - when activated, a `NOTIFY`-Activity _posts itself_ through the Execution Context hook
* - this way, further processing will happen in management mode (single threaded)
* @todo WIP 8/23 🔁 define ⟶ implement
*/
void
verifyActivity_Notify_activate()
@ -176,16 +175,15 @@ namespace test {
ActivityDetector detector;
Time tt{111,11};
notify.activate (tt, detector.executionCtx);
cout << detector.showLog() <<endl;
CHECK (detector.verifyInvocation("CTX-post").arg("11.111", "Act(NOTIFY", "≺test::CTX≻"));
}
/** @test TODO behaviour of Activity::NOTIFY
/** @test behaviour of Activity::NOTIFY when activation leads to a _dispatch_
* - when _posting_ a `NOTIFY`, a dedicated _notification_ function is invoked on the chain
* - what actually happens then depends on the receiver; here we just activate a test-Tap
* @todo WIP 8/23 🔁 define ⟶ implement
*/
void
verifyActivity_Notify_dispatch()
@ -196,14 +194,16 @@ namespace test {
Time tt{111,11};
notify.dispatch (tt, detector.executionCtx);
cout << detector.showLog() <<endl;
CHECK (detector.verifyInvocation("notifyTargetActivity").arg("11.111"));
}
/** @test TODO behaviour of Activity::GATE
* @todo WIP 8/23 🔁 define ⟶ implement
/** @test behaviour of Activity::GATE:
* if conditions are met, the activation is just passed,
* so the executor (in the Scheduler) will just invoke the chain
* @todo WIP 8/23 ✔ define ✔ implement
*/
void
verifyActivity_Gate_pass()
@ -213,54 +213,104 @@ namespace test {
gate.next = &chain;
ActivityDetector detector;
cout << detector.showLog() <<endl;
Activity& wiring = detector.buildGateWatcher (gate);
Time tt{333,33};
CHECK (activity::PASS == wiring.activate (tt, detector.executionCtx));
CHECK (detector.verifyInvocation("tap-GATE").arg("33.333 ⧐ Act(GATE"));
}
/** @test TODO behaviour of Activity::GATE
* @todo WIP 8/23 🔁 define ⟶ implement
/** @test TODO behaviour of Activity::GATE:
* the rest of the chain is just skipped in case of deadline violation
* @todo WIP 8/23 ✔ define ✔ implement
*/
void
verifyActivity_Gate_dead()
{
Activity chain;
Activity gate{0};
Activity gate{0, Time{333,33}};
gate.next = &chain;
ActivityDetector detector;
Activity& wiring = detector.buildGateWatcher (gate);
Time t1{330,33}; // still before the deadline
Time t2{333,33}; // exactly at deadline => rejected
Time t3{335,33}; // after the deadline => rejected
CHECK (activity::PASS == wiring.activate (t1, detector.executionCtx));
CHECK (detector.verifyInvocation("tap-GATE").arg("33.330 ⧐ Act(GATE").seq(0));
detector.incrementSeq();
CHECK (activity::SKIP == wiring.activate (t2, detector.executionCtx));
CHECK (detector.verifyInvocation("tap-GATE").arg("33.333 ⧐ Act(GATE").seq(1));
detector.incrementSeq();
CHECK (activity::SKIP == wiring.activate (t3, detector.executionCtx));
CHECK (detector.verifyInvocation("tap-GATE").arg("33.335 ⧐ Act(GATE").seq(2));
cout << detector.showLog() <<endl;
}
/** @test TODO behaviour of Activity::GATE
* @todo WIP 8/23 🔁 define ⟶ implement
/** @test TODO behaviour of Activity::GATE:
* the count-down condition determines if activation _passes_
* or will _spin around_ for later re-try
* @todo WIP 8/23 ✔ define ✔ implement
*/
void
verifyActivity_Gate_block()
{
Activity chain;
Activity gate{0};
Activity gate{23};
gate.next = &chain;
ActivityDetector detector;
Activity& wiring = detector.buildGateWatcher (gate);
Time tt{333,33};
CHECK (activity::SKIP == wiring.activate (tt, detector.executionCtx));
CHECK (23 == gate.data_.condition.rest); // prerequisite-count not altered
Time reScheduled = detector.executionCtx.spin(tt);
CHECK (tt < reScheduled);
cout << detector.showLog() <<endl;
CHECK (detector.verifyInvocation("tap-GATE").arg("33.333 ⧐ Act(GATE")
.beforeInvocation("CTX-post").arg(reScheduled, "Act(GATE", "≺test::CTX≻"));
}
/** @test TODO behaviour of Activity::GATE
* @todo WIP 8/23 🔁 define ⟶ implement
* @todo WIP 8/23 🔁 define ✔ implement
*/
void
verifyActivity_Gate_opened()
{
Activity chain;
Activity gate{0};
Activity gate{1};
gate.next = &chain;
ActivityDetector detector;
Activity& wiring = detector.buildGateWatcher (gate);
Time tt{333,33};
CHECK (activity::SKIP == wiring.activate (tt, detector.executionCtx));
CHECK (1 == gate.data_.condition.rest); // unchanged...
detector.incrementSeq();
// Gate receives a notification from some prerequisite Activity
CHECK (activity::PASS == wiring.notify(tt, detector.executionCtx));
CHECK (0 == gate.data_.condition.rest); // condition has been decremented...
Time reScheduled = detector.executionCtx.spin(tt);
CHECK (detector.verifyInvocation("tap-GATE").seq(0).arg("33.333 ⧐ Act(GATE")
.beforeInvocation("CTX-post").seq(0).arg(reScheduled, "Act(GATE", "≺test::CTX≻")
.beforeInvocation("tap-GATE").seq(1).arg("33.333 --notify-↯> Act(GATE")
.beforeInvocation("CTX-post").seq(1).arg(tt, "afterGATE", "≺test::CTX≻")); ////////TICKET #1319 : really re-scheduler directly? may lead to duplicate invocations!
cout << detector.showLog() <<endl;
}

74
wiki/thinkPad.ichthyo.mm
View file

@ -78663,6 +78663,29 @@ Date:&#160;&#160;&#160;Thu Apr 20 18:53:17 2023 +0200<br/>
<node CREATED="1690069633998" ID="ID_6952365" MODIFIED="1690069639563" TEXT="count-down latch"/>
<node CREATED="1690069650471" ID="ID_1897470873" MODIFIED="1692568945143" TEXT="ggfs Activation ohne else-Fall">
<arrowlink DESTINATION="ID_449595126" ENDARROW="Default" ENDINCLINATION="317;20;" ID="Arrow_ID_288430732" STARTARROW="None" STARTINCLINATION="233;-20;"/>
<node BACKGROUND_COLOR="#fdfdcf" COLOR="#ff0000" CREATED="1692726935893" HGAP="37" ID="ID_171857662" MODIFIED="1692727026451" TEXT="Gefahr von Mehrfach-Aktivierungen" VSHIFT="9">
<icon BUILTIN="messagebox_warning"/>
</node>
<node BACKGROUND_COLOR="#f0d5c5" COLOR="#990033" CREATED="1692726949758" HGAP="30" ID="ID_1811673703" MODIFIED="1692727020467" TEXT="wirklich sofort re-dispatch?" VSHIFT="11">
<icon BUILTIN="help"/>
<node CREATED="1692727029488" ID="ID_1839389865" MODIFIED="1692727048754" TEXT="wir wissen nicht, ob vorher bereits ein &#xbb;spin&#xab; re-scheduled wurde"/>
<node BACKGROUND_COLOR="#fdfdcf" COLOR="#ff0000" CREATED="1692727049374" ID="ID_88816908" MODIFIED="1692727683585">
<richcontent TYPE="NODE"><html>
<head/>
<body>
<p>
wenn wir nun unmittelbar re-dispatchen,
</p>
<p>
k&#246;nnte der chain zweimal aktiviert werden
</p>
</body>
</html></richcontent>
<arrowlink COLOR="#f72a8f" DESTINATION="ID_424129996" ENDARROW="Default" ENDINCLINATION="-365;-20;" ID="Arrow_ID_1444084792" STARTARROW="None" STARTINCLINATION="-53;219;"/>
<linktarget COLOR="#fe224d" DESTINATION="ID_88816908" ENDARROW="Default" ENDINCLINATION="-7;123;" ID="Arrow_ID_1622612414" SOURCE="ID_145651869" STARTARROW="None" STARTINCLINATION="487;21;"/>
<icon BUILTIN="clanbomber"/>
</node>
</node>
</node>
</node>
<node CREATED="1692569485796" ID="ID_1923357251" MODIFIED="1692569492311" TEXT="NOTIFY &#x27f6; HOOK">
@ -79083,6 +79106,10 @@ Date:&#160;&#160;&#160;Thu Apr 20 18:53:17 2023 +0200<br/>
<node BACKGROUND_COLOR="#f0d5c5" COLOR="#990033" CREATED="1692370004045" ID="ID_852110707" MODIFIED="1692370044558" TEXT="wahrscheinlich nur das Gegenteil: ent-blocken">
<icon BUILTIN="idea"/>
</node>
<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1692727343142" ID="ID_802575724" MODIFIED="1692727692560" TEXT="Gefahr von mehrfach-Aktivierungen durch Notification">
<arrowlink COLOR="#e81658" DESTINATION="ID_424129996" ENDARROW="Default" ENDINCLINATION="-238;-15;" ID="Arrow_ID_609240876" STARTARROW="None" STARTINCLINATION="367;18;"/>
<icon BUILTIN="messagebox_warning"/>
</node>
</node>
</node>
<node CREATED="1687788654684" ID="ID_1528240185" MODIFIED="1687788658716" TEXT="Terme">
@ -79174,7 +79201,28 @@ Date:&#160;&#160;&#160;Thu Apr 20 18:53:17 2023 +0200<br/>
<arrowlink COLOR="#a4345b" DESTINATION="ID_1825945396" ENDARROW="Default" ENDINCLINATION="196;9;" ID="Arrow_ID_784132365" STARTARROW="None" STARTINCLINATION="171;11;"/>
<icon BUILTIN="yes"/>
</node>
<node CREATED="1687996497163" ID="ID_4769641" MODIFIED="1687996508267" TEXT="dekrementiert ein angeschlossenes Gate"/>
<node CREATED="1687996497163" ID="ID_4769641" MODIFIED="1687996508267" TEXT="dekrementiert ein angeschlossenes Gate">
<node BACKGROUND_COLOR="#f0d5c5" COLOR="#990033" CREATED="1692727388608" ID="ID_260194544" MODIFIED="1692727400998" TEXT="Frage: sofort auch den Chain aktivieren?">
<icon BUILTIN="help"/>
<node CREATED="1692727402206" ID="ID_633016000" MODIFIED="1692727510359" TEXT="Vorteil: optimale Ressourcen-Nutzung">
<richcontent TYPE="NOTE"><html>
<head>
</head>
<body>
<p>
wenn die Nachricht kommt, da&#223; alle Prerequisites erf&#252;llt sind, k&#246;nnte die Berechnung sofort starten (und den aktuellen Worker nutzen); wenn wir stattdessen nur dekrementieren, verz&#246;gert sich die Weiterverarbeitung, bis durch Scheduling oder re-Scheduling das Gate erneut gepr&#252;ft wird (spinning)
</p>
</body>
</html></richcontent>
</node>
<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1692727511559" ID="ID_424129996" MODIFIED="1692727692561" TEXT="Nachteil: mu&#xdf; dann Mehrfach-Aktivierungen blocken">
<linktarget COLOR="#e81658" DESTINATION="ID_424129996" ENDARROW="Default" ENDINCLINATION="-238;-15;" ID="Arrow_ID_609240876" SOURCE="ID_802575724" STARTARROW="None" STARTINCLINATION="367;18;"/>
<linktarget COLOR="#f72a8f" DESTINATION="ID_424129996" ENDARROW="Default" ENDINCLINATION="-365;-20;" ID="Arrow_ID_1444084792" SOURCE="ID_88816908" STARTARROW="None" STARTINCLINATION="-53;219;"/>
<icon BUILTIN="flag-yellow"/>
</node>
</node>
</node>
</node>
</node>
</node>
@ -79557,20 +79605,24 @@ Date:&#160;&#160;&#160;Thu Apr 20 18:53:17 2023 +0200<br/>
<node COLOR="#338800" CREATED="1692718437941" ID="ID_1363192893" MODIFIED="1692723165688" TEXT="verifyActivity_Notify_dispatch">
<icon BUILTIN="button_ok"/>
</node>
<node BACKGROUND_COLOR="#eef0c5" COLOR="#990000" CREATED="1689199390484" ID="ID_212018049" MODIFIED="1692723170521" TEXT="verifyActivity_Gate">
<node COLOR="#338800" CREATED="1689199390484" ID="ID_212018049" MODIFIED="1692727125029" TEXT="verifyActivity_Gate">
<linktarget COLOR="#2c8d69" DESTINATION="ID_212018049" ENDARROW="Default" ENDINCLINATION="556;74;" ID="Arrow_ID_1693904148" SOURCE="ID_1220469732" STARTARROW="None" STARTINCLINATION="472;34;"/>
<icon BUILTIN="pencil"/>
<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1692723178576" ID="ID_214653366" MODIFIED="1692723193879" TEXT="pass">
<icon BUILTIN="flag-yellow"/>
<icon BUILTIN="button_ok"/>
<node COLOR="#338800" CREATED="1692723178576" ID="ID_214653366" MODIFIED="1692726894947" TEXT="pass">
<icon BUILTIN="button_ok"/>
</node>
<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1692723181232" ID="ID_1906220001" MODIFIED="1692723193880" TEXT="dead">
<icon BUILTIN="flag-yellow"/>
<node COLOR="#338800" CREATED="1692723181232" ID="ID_1906220001" MODIFIED="1692726895935" TEXT="dead">
<icon BUILTIN="button_ok"/>
</node>
<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1692723183479" ID="ID_785522791" MODIFIED="1692723193880" TEXT="block">
<icon BUILTIN="flag-yellow"/>
<node COLOR="#338800" CREATED="1692723183479" ID="ID_785522791" MODIFIED="1692726896672" TEXT="block">
<icon BUILTIN="button_ok"/>
</node>
<node COLOR="#338800" CREATED="1692723186655" ID="ID_343855322" MODIFIED="1692726899386" TEXT="opened">
<icon BUILTIN="button_ok"/>
<node BACKGROUND_COLOR="#f0d5c5" COLOR="#990033" CREATED="1692726976360" ID="ID_145651869" MODIFIED="1692727118198" TEXT="aber kl&#xe4;ren: wie k&#xf6;nnen Mehrfach-Aktivierungen verhindert werden?">
<arrowlink COLOR="#fe224d" DESTINATION="ID_88816908" ENDARROW="Default" ENDINCLINATION="-7;123;" ID="Arrow_ID_1622612414" STARTARROW="None" STARTINCLINATION="487;21;"/>
<icon BUILTIN="help"/>
</node>
<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1692723186655" ID="ID_343855322" MODIFIED="1692723193881" TEXT="opened">
<icon BUILTIN="flag-yellow"/>
</node>
</node>
<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1689200547247" ID="ID_1506436785" MODIFIED="1689200552551" TEXT="termBuilder">