summaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/command_executor_portfolio.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/main/command_executor_portfolio.cpp b/src/main/command_executor_portfolio.cpp
index a4a0fcad3..d492bf26c 100644
--- a/src/main/command_executor_portfolio.cpp
+++ b/src/main/command_executor_portfolio.cpp
@@ -142,6 +142,9 @@ void CommandExecutorPortfolio::lemmaSharingCleanup()
{
assert(d_numThreads == d_options[options::threads]);
+ if(d_numThreads == 1)
+ return;
+
// Channel cleanup
assert(d_channelsIn.size() == d_numThreads);
assert(d_channelsOut.size() == d_numThreads);
@@ -248,11 +251,14 @@ bool CommandExecutorPortfolio::doCommandSingleton(Command* cmd)
);
}
- assert(d_channelsIn.size() == d_numThreads);
- assert(d_channelsOut.size() == d_numThreads);
+ assert(d_channelsIn.size() == d_numThreads
+ || d_numThreads == 1);
+ assert(d_channelsOut.size() == d_numThreads
+ || d_numThreads == 1);
assert(d_smts.size() == d_numThreads);
boost::function<void()>
- smFn = boost::bind(sharingManager<ChannelFormat>,
+ smFn = d_numThreads <= 1 ? boost::function<void()>() :
+ boost::bind(sharingManager<ChannelFormat>,
d_numThreads,
&d_channelsOut[0],
&d_channelsIn[0],
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback