Skip to content

Commit 70fe377

Browse files
committed
added asserts to make sure executors are only used in the intended context
1 parent 87755e3 commit 70fe377

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

cli/processexecutor.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232

3333
#include <algorithm>
3434
#include <numeric>
35+
#include <cassert>
3536
#include <cerrno>
3637
#include <csignal>
3738
#include <cstdlib>
@@ -61,7 +62,9 @@ using std::memset;
6162

6263
ProcessExecutor::ProcessExecutor(const std::map<std::string, std::size_t> &files, Settings &settings, ErrorLogger &errorLogger)
6364
: Executor(files, settings, errorLogger)
64-
{}
65+
{
66+
assert(mSettings.jobs > 1);
67+
}
6568

6669
ProcessExecutor::~ProcessExecutor()
6770
{}

cli/singleexecutor.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include "library.h"
2424
#include "settings.h"
2525

26+
#include <cassert>
2627
#include <list>
2728
#include <numeric>
2829
#include <utility>
@@ -32,7 +33,9 @@ class ErrorLogger;
3233
SingleExecutor::SingleExecutor(CppCheck &cppcheck, const std::map<std::string, std::size_t> &files, Settings &settings, ErrorLogger &errorLogger)
3334
: Executor(files, settings, errorLogger)
3435
, mCppcheck(cppcheck)
35-
{}
36+
{
37+
assert(mSettings.jobs == 1);
38+
}
3639

3740
SingleExecutor::~SingleExecutor()
3841
{}

cli/threadexecutor.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include "settings.h"
2727

2828
#include <algorithm>
29+
#include <cassert>
2930
#include <cstdlib>
3031
#include <functional>
3132
#include <future>
@@ -41,7 +42,9 @@ enum class Color;
4142

4243
ThreadExecutor::ThreadExecutor(const std::map<std::string, std::size_t> &files, Settings &settings, ErrorLogger &errorLogger)
4344
: Executor(files, settings, errorLogger)
44-
{}
45+
{
46+
assert(mSettings.jobs > 1);
47+
}
4548

4649
ThreadExecutor::~ThreadExecutor()
4750
{}

0 commit comments

Comments
 (0)