Skip to content

[pull] main from ChunelFeng:main #288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Apr 5, 2026
Merged

[pull] main from ChunelFeng:main #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/GraphCtrl/GraphElement/_GEngine/GDynamicEngine/GDynamicEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ CVoid GDynamicEngine::commonRunAll() {
* 2. 在element执行完成之后，进行裂变，直到所有的element执行完成
* 3. 等待异步执行结束
*/
finished_end_size_ = 0;
finished_end_size_.store(0, std::memory_order_release);
for (auto* element : front_element_arr_) {
process(element, element == front_element_arr_.back());
}
Expand Down Expand Up @@ -185,8 +185,9 @@ CVoid GDynamicEngine::afterElementRun(GElementPtr element) {
break;
case internal::GElementShape::TAIL:
{
CGRAPH_LOCK_GUARD lock(locker_.mtx_);
if ((++finished_end_size_ >= total_end_size_)) {
const auto curEndSize = finished_end_size_.fetch_add(1, std::memory_order_acq_rel) + 1;
if (curEndSize == total_end_size_) {
CGRAPH_LOCK_GUARD lock(locker_.mtx_);
locker_.cv_.notify_one();
}
}
Expand All @@ -210,7 +211,7 @@ CVoid GDynamicEngine::fatWait() {
* 1，执行结束
* 2，状态异常
*/
return (finished_end_size_ >= total_end_size_) || cur_status_.isErr();
return (finished_end_size_.load(std::memory_order_acquire) >= total_end_size_) || cur_status_.isErr();
});
}

Expand Down
9 changes: 4 additions & 5 deletions src/GraphCtrl/GraphElement/_GEngine/GDynamicEngine/GDynamicEngine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,10 @@ class GDynamicEngine : public GEngine {
GElementPtrArr total_element_arr_ {}; // pipeline中所有的元素信息集合
GElementPtrArr front_element_arr_ {}; // 没有依赖的元素信息
CSize total_end_size_ = 0; // 图结束节点数量
CSize finished_end_size_ = 0; // 执行结束节点数量
CStatus cur_status_; // 当前全局的状态信息
std::atomic<CSize> parallel_run_num_ {0}; // 纯并行时，执行的个数信息
std::atomic<CSize> finished_end_size_ {0}; // 执行结束节点数量
CStatus cur_status_ {}; // 当前全局的状态信息
std::atomic<CSize> parallel_run_num_ {0}; // 纯并行时，执行的个数信息
GElementPtrMat2D parallel_element_matrix_ {}; // 纯并行时，记录分解后的数据

internal::GEngineDagType dag_type_ = { internal::GEngineDagType::COMMON }; // 当前元素的排布形式

UCvMutex locker_;
Expand All @@ -122,4 +121,4 @@ class GDynamicEngine : public GEngine {

CGRAPH_NAMESPACE_END

#endif // CGRAPH_GDYNAMICENGINE_H
#endif // CGRAPH_GDYNAMICENGINE_H
Loading