diff options
author | Kshitij Bansal <kshitij@cs.nyu.edu> | 2012-11-15 22:39:58 +0000 |
---|---|---|
committer | Kshitij Bansal <kshitij@cs.nyu.edu> | 2012-11-15 22:39:58 +0000 |
commit | 9d55fef4dfa9d4b98457d36c3ef56b6771d0bd65 (patch) | |
tree | b517a7887a6f072796636596baef8465576b7a6f /src/main | |
parent | ba84f4ca24d075eddafc93a3dd00d8484e351e0e (diff) |
some fixes for --threads=1
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/command_executor_portfolio.cpp | 12 |
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], |