updated executor

tsung-wei-huang · tsung-wei-huang · commit a1eb7c0edd02 · 2019-05-27T13:45:14.000-05:00
diff --git a/taskflow/core/executor.hpp b/taskflow/core/executor.hpp
@@ -751,14 +751,14 @@ inline void Executor::_sync_topology(Topology& tpg) {
       // Set the promise
       tpg._promise.set_value();
       f._topologies.pop_front();
-      f._topologies.front()._bind(f._graph);
       f._mtx.unlock();
 
       {
         std::scoped_lock lock(_topology_mutex);
         _num_topologies--;
       }
 
+      f._topologies.front()._bind(f._graph);
       _schedule(f._topologies.front()._sources);
     }
     else {
@@ -844,7 +844,6 @@ std::future<void> Executor::run_until(Taskflow& f, P&& pred, C&& c) {
   // Notice here calling schedule may cause the topology to be removed sonner 
   // before the function leaves.
   if(run_now) {
-    // TODO: seg fault 
     tpg->_bind(f._graph);
     _schedule(tpg->_sources);
   }

Original file line number	Diff line number	Diff line change
`@@ -751,14 +751,14 @@ inline void Executor::_sync_topology(Topology& tpg) {`
`751`	`751`	`// Set the promise`
`752`	`752`	`tpg._promise.set_value();`
`753`	`753`	`f._topologies.pop_front();`
`754`		`- f._topologies.front()._bind(f._graph);`
`755`	`754`	`f._mtx.unlock();`
`756`	`755`
`757`	`756`	`{`
`758`	`757`	`std::scoped_lock lock(_topology_mutex);`
`759`	`758`	`_num_topologies--;`
`760`	`759`	`}`
`761`	`760`
	`761`	`+ f._topologies.front()._bind(f._graph);`
`762`	`762`	`_schedule(f._topologies.front()._sources);`
`763`	`763`	`}`
`764`	`764`	`else {`
`@@ -844,7 +844,6 @@ std::future<void> Executor::run_until(Taskflow& f, P&& pred, C&& c) {`
`844`	`844`	`// Notice here calling schedule may cause the topology to be removed sonner`
`845`	`845`	`// before the function leaves.`
`846`	`846`	`if(run_now) {`
`847`		`- // TODO: seg fault`
`848`	`847`	`tpg->_bind(f._graph);`
`849`	`848`	`_schedule(tpg->_sources);`
`850`	`849`	`}`