Merge pull request taskflow#114 from mrogez-yseop/fix/empty_composed_flow

clin99 · web-flow · commit 78d2a4704832 · 2019-08-28T11:22:09.000-05:00
fix: empty composed taskflow was causing executor to block
diff --git a/taskflow/core/executor.hpp b/taskflow/core/executor.hpp
@@ -510,7 +510,7 @@ inline void Executor::_schedule_unsync(
 ) const {
   
   // module node need another initialization
-  if(node->_module != nullptr && !node->is_spawned()) {
+  if(node->_module != nullptr && !node->_module->empty() && !node->is_spawned()) {
     _init_module_node_unsync(node, stack);
   }
 
@@ -526,7 +526,7 @@ inline void Executor::_schedule_unsync(
   // here we guarantee to run by a thread so no need to cache the
   // size from nodes
   for(auto node : nodes) {
-    if(node->_module != nullptr && !node->is_spawned()) {
+    if(node->_module != nullptr && !node->_module->empty() && !node->is_spawned()) {
       _init_module_node_unsync(node, stack);
     }
     stack.push(node);
@@ -541,7 +541,7 @@ inline void Executor::_schedule(Node* node, bool bypass) {
   assert(_workers.size() != 0);
   
   // module node need another initialization
-  if(node->_module != nullptr && !node->is_spawned()) {
+  if(node->_module != nullptr && !node->_module->empty() && !node->is_spawned()) {
     _init_module_node(node);
   }
   
@@ -582,7 +582,7 @@ inline void Executor::_schedule(PassiveVector<Node*>& nodes) {
   }
 
   for(auto node : nodes) {
-    if(node->_module != nullptr && !node->is_spawned()) {
+    if(node->_module != nullptr && !node->_module->empty() && !node->is_spawned()) {
       _init_module_node(node);
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -510,7 +510,7 @@ inline void Executor::_schedule_unsync(`
`510`	`510`	`) const {`
`511`	`511`
`512`	`512`	`// module node need another initialization`
`513`		`- if(node->_module != nullptr && !node->is_spawned()) {`
	`513`	`+ if(node->_module != nullptr && !node->_module->empty() && !node->is_spawned()) {`
`514`	`514`	`_init_module_node_unsync(node, stack);`
`515`	`515`	`}`
`516`	`516`
`@@ -526,7 +526,7 @@ inline void Executor::_schedule_unsync(`
`526`	`526`	`// here we guarantee to run by a thread so no need to cache the`
`527`	`527`	`// size from nodes`
`528`	`528`	`for(auto node : nodes) {`
`529`		`- if(node->_module != nullptr && !node->is_spawned()) {`
	`529`	`+ if(node->_module != nullptr && !node->_module->empty() && !node->is_spawned()) {`
`530`	`530`	`_init_module_node_unsync(node, stack);`
`531`	`531`	`}`
`532`	`532`	`stack.push(node);`
`@@ -541,7 +541,7 @@ inline void Executor::_schedule(Node* node, bool bypass) {`
`541`	`541`	`assert(_workers.size() != 0);`
`542`	`542`
`543`	`543`	`// module node need another initialization`
`544`		`- if(node->_module != nullptr && !node->is_spawned()) {`
	`544`	`+ if(node->_module != nullptr && !node->_module->empty() && !node->is_spawned()) {`
`545`	`545`	`_init_module_node(node);`
`546`	`546`	`}`
`547`	`547`
`@@ -582,7 +582,7 @@ inline void Executor::_schedule(PassiveVector<Node*>& nodes) {`
`582`	`582`	`}`
`583`	`583`
`584`	`584`	`for(auto node : nodes) {`
`585`		`- if(node->_module != nullptr && !node->is_spawned()) {`
	`585`	`+ if(node->_module != nullptr && !node->_module->empty() && !node->is_spawned()) {`
`586`	`586`	`_init_module_node(node);`
`587`	`587`	`}`
`588`	`588`	`}`