allowed user to specify TIMEOUT status

godsme · Mar 5, 2021 · 0dfd1e5 · 0dfd1e5
1 parent 1b8a53e
commit 0dfd1e5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/include/trans-dsl/sched/action/SchedTimeGuard.h b/include/trans-dsl/sched/action/SchedTimeGuard.h
@@ -39,6 +39,8 @@ struct SchedTimeGuard : SchedAction {
    State state = State::INIT;
    bool externalForceStopped = false;
 
+private:
+    ABSTRACT(getTimeoutResult() const -> Status);
 private:
    USE_ROLE(RelativeTimer);
    USE_ROLE(SchedAction);

diff --git a/include/trans-dsl/sched/helper/TimeGuardHelper.h b/include/trans-dsl/sched/helper/TimeGuardHelper.h
@@ -16,7 +16,7 @@ TSL_NS_BEGIN
 
 namespace details {
 
-   template<TimerId V_TIMER_ID, typename T_ACTION>
+   template<TimerId V_TIMER_ID, typename T_ACTION, Status TIMEOUT_RESULT = Result::TIMEOUT>
    struct TimeGuard final {
       template<TransListenerObservedAids const& AIDs>
       class ActionRealType : public SchedTimeGuard {
@@ -28,14 +28,14 @@ namespace details {
 
          Action action;
          PlatformSpecifiedTimer timer{V_TIMER_ID};
-
+         OVERRIDE(getTimeoutResult() const -> Status) { return TIMEOUT_RESULT; }
       public:
          using ThreadActionCreator = ThreadCreator_t<Action>;
       };
    };
 
-   template<TimerId V_TIMER_ID, typename T_ACTION>
-   using TimeGuard_t = typename TimeGuard<V_TIMER_ID, T_ACTION>::template ActionRealType<EmptyAids>;
+   template<TimerId V_TIMER_ID, typename T_ACTION, Status TIMEOUT_RESULT = Result::TIMEOUT>
+   using TimeGuard_t = typename TimeGuard<V_TIMER_ID, T_ACTION, TIMEOUT_RESULT>::template ActionRealType<EmptyAids>;
 }
 
 TSL_NS_END

diff --git a/src/sched/action/SchedTimeGuard.cpp b/src/sched/action/SchedTimeGuard.cpp
@@ -80,7 +80,7 @@ auto SchedTimeGuard::handleEventTimeout(TransactionContext& context, Event const
    }
 
    if(status == Result::SUCCESS || (status == Result::FORCE_STOPPED && !externalForceStopped)) {
-      status = Result::TIMEOUT;
+      status = getTimeoutResult();
    }
 
    state = State::DONE;
@@ -143,7 +143,7 @@ auto SchedTimeGuard::onTimeout(TransactionContext& context) -> Status {
       status = stop_(context, Result::TIMEOUT);
       likely_branch
       if(status == Result::SUCCESS || status == Result::FORCE_STOPPED) {
-         return Result::TIMEOUT;
+         return getTimeoutResult();
       }
    }