Skip to content
Merged
Changes from all commits
Commits
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
27 changes: 18 additions & 9 deletions src/GraphCtrl/GraphPipeline/GPipelineFactory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,14 @@ std::mutex GPipelineFactory::s_lock_;

GPipelinePtr GPipelineFactory::create() {
CGRAPH_FUNCTION_BEGIN
CGRAPH_LOCK_GUARD lock(s_lock_);


auto pipeline = CGRAPH_SAFE_MALLOC_COBJECT(GPipeline)
s_pipeline_list_.emplace_back(pipeline);

{
CGRAPH_LOCK_GUARD lock(s_lock_);
s_pipeline_list_.emplace_back(pipeline);
}

return pipeline;
}

Expand All @@ -27,8 +31,10 @@ CStatus GPipelineFactory::remove(GPipelinePtr pipeline) {
CGRAPH_FUNCTION_BEGIN
CGRAPH_ASSERT_NOT_NULL(pipeline)

CGRAPH_LOCK_GUARD lock(s_lock_);
s_pipeline_list_.remove(pipeline);
{
CGRAPH_LOCK_GUARD lock(s_lock_);
s_pipeline_list_.remove(pipeline);
}
CGRAPH_DELETE_PTR(pipeline)

CGRAPH_FUNCTION_END
Expand All @@ -37,13 +43,16 @@ CStatus GPipelineFactory::remove(GPipelinePtr pipeline) {

CStatus GPipelineFactory::clear() {
CGRAPH_FUNCTION_BEGIN
CGRAPH_LOCK_GUARD lock(s_lock_);

for (GPipelinePtr pipeline : GPipelineFactory::s_pipeline_list_) {
CGRAPH_DELETE_PTR(pipeline)
{
CGRAPH_LOCK_GUARD lock(s_lock_);
for (GPipelinePtr pipeline : GPipelineFactory::s_pipeline_list_) {
CGRAPH_DELETE_PTR(pipeline)
}

s_pipeline_list_.clear();
}

s_pipeline_list_.clear();
CGRAPH_FUNCTION_END
}

Expand Down