12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use cleaner function for spawning TBB tasks

release/4.3a0
Richard Roberts 2013-09-16 20:59:00 +00:00
parent 0bb5d1595d
commit b050e96b93
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtsam/base/treeTraversal-inst.h
View File

@ -155,18 +155,14 @@ namespace gtsam {
// Set TBB ref count // Set TBB ref count
set_ref_count(1 + (int)roots.size()); set_ref_count(1 + (int)roots.size());
// Create data and tasks for our children // Create data and tasks for our children
FastVector<PreOrderTask*> tasks; tbb::task_list tasks;
tasks.reserve(roots.size());
BOOST_FOREACH(const boost::shared_ptr<NODE>& root, roots) BOOST_FOREACH(const boost::shared_ptr<NODE>& root, roots)
{ {
tasks.push_back(new(allocate_child()) tasks.push_back(*new(allocate_child())
PreOrderTask(root, visitorPre(root, myData), visitorPre, visitorPost, problemSizeThreshold)); PreOrderTask(root, visitorPre(root, myData), visitorPre, visitorPost, problemSizeThreshold));
} }
// Spawn tasks // Spawn tasks
BOOST_FOREACH(PreOrderTask* task, tasks) spawn_and_wait_for_all(tasks);
spawn(*task);
// Wait for tasks to finish
wait_for_all();
// Return NULL // Return NULL
return NULL; return NULL;
} }