[chg] change gsome virtual api, from getWaitTime to getThreshold

Author: ChunelFeng

python/tutorial/MyGSome/MySome.py

@@ -9,5 +9,5 @@
 from pycgraph import GSome
 
 class MyGSome(GSome):
-    def getWaitNum(self):
+    def getThreshold(self):
         return 1

python/wrapper/PywGSome.h

@@ -21,15 +21,15 @@ class PywGSome : public CGraph::GSome {
     }
     ~PywGSome() override = default;
 
-    CSize getWaitNum() override {
-        PYBIND11_OVERLOAD_PURE(CSize, PywGSome, getWaitNum);
+    CSize getThreshold() override {
+        PYBIND11_OVERLOAD_PURE(CSize, PywGSome, getThreshold);
     }
 };
 
 
 PYCGRAPH_DECLARE_GGROUP_INTERFACE_CLASS(PywGSome,
-    CSize getWaitNum() override {
-        PYBIND11_OVERLOAD_PURE(CSize, PywGSomeInterface, getWaitNum);
+    CSize getThreshold() override {
+        PYBIND11_OVERLOAD_PURE(CSize, PywGSomeInterface, getThreshold);
     });
 
 #endif //CGRAPH_PYWGSOME_H

src/GraphCtrl/GraphElement/GGroup/GSome/GSome.cpp

@@ -40,9 +40,9 @@ CStatus GSome::addElementEx(GElementPtr element) {
 CStatus GSome::run() {
     CGRAPH_FUNCTION_BEGIN
 
-    wait_num_ = getWaitNum();
-    CGRAPH_RETURN_ERROR_STATUS_BY_CONDITION(wait_num_ > children_.size(),
-        "num is bigger than elements size.");
+    threshold_ = getThreshold();
+    CGRAPH_RETURN_ERROR_STATUS_BY_CONDITION(threshold_ > children_.size(),
+        "threshold cannot bigger than elements size.");
     cur_status_.reset();
 
     /**
@@ -57,7 +57,7 @@ CStatus GSome::run() {
                 const auto& curStatus = element->fatProcessor(CFunctionType::RUN);
                 CGRAPH_UNIQUE_LOCK lock(lock_);
                 cur_status_ += curStatus;
-                if (--wait_num_ == 0 || cur_status_.isErr()) {
+                if (--threshold_ == 0 || cur_status_.isErr()) {
                     cv_.notify_one();
                 }
             }
@@ -67,7 +67,7 @@ CStatus GSome::run() {
     thread_pool_->wakeupAllThread();
     CGRAPH_UNIQUE_LOCK lock(lock_);
     cv_.wait(lock, [this] {
-        return wait_num_ == 0 || cur_status_.isErr();
+        return threshold_ == 0 || cur_status_.isErr();
     });
 
     for (auto* element : children_) {
@@ -108,7 +108,7 @@ CStatus GSome::checkSuitable() {
     status = GElement::checkSuitable();
     CGRAPH_FUNCTION_CHECK_STATUS
 
-    CGRAPH_RETURN_ERROR_STATUS_BY_CONDITION((CGRAPH_DEFAULT_LOOP_TIMES != loop_), "GSome cannot set loop > 1.")
+    CGRAPH_RETURN_ERROR_STATUS_BY_CONDITION(CGRAPH_DEFAULT_LOOP_TIMES != loop_, "GSome cannot set loop > 1.")
     CGRAPH_RETURN_ERROR_STATUS_BY_CONDITION(std::any_of(children_.begin(), children_.end(), [](GElementPtr ptr) {
         return !ptr->isAsync();
     }), "GSome contains async node only.")

src/GraphCtrl/GraphElement/GGroup/GSome/GSome.h

@@ -20,10 +20,10 @@ class GSome : public GGroup {
 protected:
     /**
      * 设定 wait_num 个数
-     * 当前 group 执行完成 wait_num 个后，就可以继续执行
+     * 当前 group 执行完成 threshold 个后，就可以继续执行
      * @return
      */
-    virtual CSize getWaitNum() = 0;
+    virtual CSize getThreshold() = 0;
 
 protected:
     explicit GSome();
@@ -41,7 +41,7 @@ class GSome : public GGroup {
     CStatus addElementEx(GElementPtr element) override;
 
 private:
-    CSize wait_num_ {0};                       // 还剩的触发结束的个数
+    CSize threshold_ {0};                      // 还剩的触发结束的个数
     CStatus cur_status_ ;                      // 记录异步时刻的当前状态信息
 
     std::mutex lock_;

tutorial/MyGSome/MySome.h

@@ -13,7 +13,7 @@
 
 class MySome : public CGraph::GSome {
 protected:
-    CSize getWaitNum() override {
+    CSize getThreshold() override {
         /**
          * 执行完 1个之后，当前的 GSome 就继续往后执行
          * 其余的 element，会在 pipeline 结束之前，执行完成。