feat(flow):1.11.11, 使用SerialAssembleAction对所有组装对象进行改进

Author: hevake

modules/flow/CMakeLists.txt

@@ -110,7 +110,7 @@ set_target_properties(
 
 if(${TBOX_ENABLE_TEST})
     add_executable(${TBOX_LIBRARY_NAME}_test ${TBOX_FLOW_TEST_SOURCES})
-    target_link_libraries(${TBOX_LIBRARY_NAME}_test gmock_main gmock gtest pthread ${TBOX_LIBRARY_NAME} tbox_base tbox_event tbox_util rt dl)
+    target_link_libraries(${TBOX_LIBRARY_NAME}_test gmock_main gmock gtest pthread ${TBOX_LIBRARY_NAME} tbox_eventx tbox_event tbox_util tbox_base rt dl)
     add_test(NAME ${TBOX_LIBRARY_NAME}_test COMMAND ${TBOX_LIBRARY_NAME}_test)
 endif()
 

modules/flow/Makefile

@@ -97,7 +97,7 @@ TEST_CPP_SRC_FILES = \
 	actions/switch_action_test.cpp \
 	to_graphviz_test.cpp \
 
-TEST_LDFLAGS := $(LDFLAGS) -ltbox_flow -ltbox_event -ltbox_util -ltbox_base -ldl
+TEST_LDFLAGS := $(LDFLAGS) -ltbox_flow -ltbox_eventx -ltbox_event -ltbox_util -ltbox_base -ldl
 ENABLE_SHARED_LIB = no
 
 include $(TOP_DIR)/mk/lib_tbox_common.mk

modules/flow/actions/assemble_action.cpp

@@ -54,5 +54,93 @@ void AssembleAction::onFinal()
         final_cb_();
 }
 
+bool SerialAssembleAction::startThisAction(Action *action)
+{
+    if (action->start()) {
+        curr_action_ = action;
+        return true;
+    }
+
+    return false;
+}
+
+void SerialAssembleAction::stopCurrAction()
+{
+    if (curr_action_ != nullptr) {
+        curr_action_->stop();
+        curr_action_ = nullptr;
+    }
+}
+
+bool SerialAssembleAction::handleChildFinishEvent(ChildFinishFunc &&child_finish_func)
+{
+    curr_action_ = nullptr;
+
+    //! 如果处于运行状态，则由派生类自行处理
+    if (state() == State::kRunning)
+        return false;
+
+    //! 如果处于暂停状态，则暂存结果
+    if (state() == State::kPause)
+        child_finish_func_ = std::move(child_finish_func);
+
+    //! 其它状态，如已结束或停止，则不处理
+    return true;
+}
+
+void SerialAssembleAction::onLastChildFinished(bool is_succ, const Reason &reason, const Trace &trace)
+{
+    curr_action_ = nullptr;
+
+    //! 如果处于运行状态，则正常退出
+    if (state() == State::kRunning) {
+        finish(is_succ, reason, trace);
+        return;
+    }
+
+    //! 如果处于暂停状态，则暂存结果
+    if (state() == State::kPause)
+        child_finish_func_ = [this, is_succ, reason, trace] { finish(is_succ, reason, trace); };
+
+    //! 其它状态，如已结束或停止，则不处理
+}
+
+void SerialAssembleAction::onPause()
+{
+    if (curr_action_ != nullptr)
+        curr_action_->pause();
+
+    AssembleAction::onPause();
+}
+
+void SerialAssembleAction::onResume()
+{
+    AssembleAction::onResume();
+
+    if (curr_action_ != nullptr) {
+        curr_action_->resume();
+
+    } else if (child_finish_func_) {
+        loop_.runNext(std::move(child_finish_func_));
+
+    } else {
+        LogWarn("%d:%s[%s] can't resume", id(), type().c_str(), label().c_str());
+    }
+}
+
+void SerialAssembleAction::onStop()
+{
+    if (curr_action_ != nullptr)
+        curr_action_->stop();
+
+    AssembleAction::onStop();
+}
+
+void SerialAssembleAction::onReset()
+{
+    curr_action_ = nullptr;
+    child_finish_func_ = nullptr;
+}
+
 }
 }

modules/flow/actions/assemble_action.h

@@ -48,6 +48,33 @@ class AssembleAction : public Action {
     FinalCallback final_cb_;
 };
 
+//! 串行执行的组装动作
+class SerialAssembleAction : public AssembleAction {
+  public:
+    using AssembleAction::AssembleAction;
+
+  protected:
+    virtual void onPause() override;
+    virtual void onResume() override;
+    virtual void onStop() override;
+    virtual void onReset() override;
+
+  protected:
+    using ChildFinishFunc = std::function<void()>;
+
+    bool startThisAction(Action *action);
+    void stopCurrAction();
+
+    //! 子动作结束事件处理
+    bool handleChildFinishEvent(ChildFinishFunc &&child_finish_func);
+    //! 最后一个动作结束的缺省处理
+    void onLastChildFinished(bool is_succ, const Reason &reason, const Trace &trace);
+
+  private:
+    Action *curr_action_ = nullptr;     //! 当前正在执行的动作
+    ChildFinishFunc child_finish_func_; //! 上一个动用缓存的finish事件
+};
+
 }
 }
 

modules/flow/actions/composite_action.cpp

@@ -32,21 +32,28 @@ CompositeAction::~CompositeAction() {
 }
 
 bool CompositeAction::setChild(Action *child) {
-    if (child == nullptr)
+    if (child == nullptr) {
+        LogWarn("%d:%s[%s], add child %d:%s[%s] fail, child == nullptr",
+                id(), type().c_str(), label().c_str());
+        return false;
+    }
+
+    if (!child->setParent(this))
         return false;
 
+    child->setFinishCallback(std::bind(&CompositeAction::onLastChildFinished, this, _1, _2, _3));
+    child->setBlockCallback(std::bind(&CompositeAction::block, this, _1, _2));
+
     CHECK_DELETE_RESET_OBJ(child_);
     child_ = child;
-    child_->setFinishCallback(std::bind(&CompositeAction::onChildFinished, this, _1, _2, _3));
-    child_->setBlockCallback(std::bind(&CompositeAction::onChildBlocked, this, _1, _2));
-    child_->setParent(this);
 
     return true;
 }
 
 void CompositeAction::toJson(Json &js) const {
+    SerialAssembleAction::toJson(js);
+
     TBOX_ASSERT(child_ != nullptr);
-    AssembleAction::toJson(js);
     child_->toJson(js["child"]);
 }
 
@@ -59,60 +66,24 @@ bool CompositeAction::isReady() const {
 }
 
 void CompositeAction::onStart() {
-    AssembleAction::onStart();
-
-    TBOX_ASSERT(child_ != nullptr);
-    child_->start();
-}
+    SerialAssembleAction::onStart();
 
-void CompositeAction::onStop() {
     TBOX_ASSERT(child_ != nullptr);
-    child_->stop();
-
-    AssembleAction::onStop();
-}
-
-void CompositeAction::onPause() {
-    TBOX_ASSERT(child_ != nullptr);
-    child_->pause();
-
-    AssembleAction::onPause();
-}
-
-void CompositeAction::onResume() {
-    AssembleAction::onResume();
-
-    TBOX_ASSERT(child_ != nullptr);
-    if (child_->state() == State::kFinished) {
-        finish(child_->result() == Result::kSuccess);
-    } else {
-        child_->resume();
-    }
+    startThisAction(child_);
 }
 
 void CompositeAction::onReset() {
     TBOX_ASSERT(child_ != nullptr);
     child_->reset();
 
-    AssembleAction::onReset();
+    SerialAssembleAction::onReset();
 }
 
 void CompositeAction::onFinished(bool is_succ, const Reason &why, const Trace &trace) {
     //! 有可能不是child_自然结束产生的finish
-    TBOX_ASSERT(child_ != nullptr);
-    child_->stop();
-
-    AssembleAction::onFinished(is_succ, why, trace);
-}
-
-void CompositeAction::onChildFinished(bool is_succ, const Reason &why, const Trace &trace) {
-    if (state() == State::kRunning)
-        finish(is_succ, why, trace);
-}
+    stopCurrAction();
 
-void CompositeAction::onChildBlocked(const Reason &why, const Trace &trace) {
-    if (state() == State::kRunning)
-        block(why, trace);
+    SerialAssembleAction::onFinished(is_succ, why, trace);
 }
 
 }

modules/flow/actions/composite_action.h

@@ -46,9 +46,9 @@ namespace flow {
  *
  * 不用重写`Action`中其它虚函数。
  */
-class CompositeAction : public AssembleAction {
+class CompositeAction : public SerialAssembleAction {
   public:
-    using AssembleAction::AssembleAction;
+    using SerialAssembleAction::SerialAssembleAction;
     virtual ~CompositeAction();
 
   public:
@@ -59,15 +59,9 @@ class CompositeAction : public AssembleAction {
 
   protected:
     virtual void onStart() override;
-    virtual void onStop() override;
-    virtual void onPause() override;
-    virtual void onResume() override;
     virtual void onReset() override;
     virtual void onFinished(bool is_succ, const Reason &why, const Trace &trace) override;
 
-    void onChildFinished(bool is_succ, const Reason &why, const Trace &trace);
-    void onChildBlocked(const Reason &why, const Trace &trace);
-
   private:
     Action *child_ = nullptr;
 };