1. fixed Safe bug; 2. stop loop returns FORCE_STOPPED

godsme · Mar 3, 2021 · 1b8a53e · 1b8a53e
1 parent 41fc5a3
commit 1b8a53e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/include/trans-dsl/sched/helper/SafeHelper.h b/include/trans-dsl/sched/helper/SafeHelper.h
@@ -16,7 +16,7 @@ namespace details {
    template<typename T_ACTION>
    struct Safe : SchedSafe {
       template<TransListenerObservedAids const& AIDs>
-      class ActionRealType : SchedSafe {
+      class ActionRealType : public SchedSafe {
          using Action = ActionRealTypeTraits_t<AIDs, T_ACTION>;
          CONCEPT_ASSERT(SchedActionConcept<Action>);
 
@@ -30,6 +30,6 @@ namespace details {
 
 TSL_NS_END
 
-#define __safe(...) TSL_NS::details::Safe_<TSL_NS::details::AutoAction::SequentialTrait_t<__VA_ARGS__>>
+#define __safe(...) TSL_NS::details::Safe<TSL_NS::details::AutoAction::SequentialTrait_t<__VA_ARGS__>>
 
 #endif //TRANS_DSL_2_SAFEHELPER_H
diff --git a/src/sched/action/SchedLoop.cpp b/src/sched/action/SchedLoop.cpp
@@ -96,14 +96,18 @@ auto SchedLoop::exec(TransactionContext& context) -> Status {
 ////////////////////////////////////////////////////////////////////////////////////////
 auto SchedLoop::handleEvent_(TransactionContext& context, Event const& event) -> Status {
    Status status = action->handleEvent(context, event);
-   if (is_working_status(status) || stopping) {
+   if (is_working_status(status)) {
       return status;
    }
 
    if(cub::is_failed_status(status)) {
       reportFailure(status);
    }
 
+   if(stopping) {
+      return Result::FORCE_STOPPED;
+   }
+
    return looping(context);
 }
 

diff --git a/src/sched/action/SchedSafe.cpp b/src/sched/action/SchedSafe.cpp
@@ -4,29 +4,30 @@
 
 #include <trans-dsl/sched/action/SchedSafe.h>
 #include <trans-dsl/utils/ActionStatus.h>
+#include <trans-dsl/utils/AssertionHelper.h>
 
 TSL_NS_BEGIN
 
 ///////////////////////////////////////////////////////////////////////////////
 auto SchedSafe::exec(TransactionContext& context) -> Status {
-   if(state != State::IDLE) return Result::FATAL_BUG;
+   BUG_CHECK(state == State::IDLE);
    Status status = ROLE(SchedAction).exec(context);
    state = is_working_status(status) ? State::WORKING : State::DONE;
    return status;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 auto SchedSafe::handleEvent(TransactionContext& context, Event const& event) -> Status {
-   if(state != State::WORKING) return FATAL_BUG;
+   BUG_CHECK(state == State::WORKING);
    Status status = ROLE(SchedAction).handleEvent(context, event);
-   if(is_working_status(status)) {
+   if(!is_working_status(status)) {
       state = State::DONE;
    }
    return status;
 }
 ///////////////////////////////////////////////////////////////////////////////
 auto SchedSafe::stop(TransactionContext&, Status) -> Status {
-   if(state != State::WORKING) return FATAL_BUG;
+   BUG_CHECK(state == State::WORKING);
    return Result::CONTINUE;
 }