Skip to content

Commit 6271c02

Browse files
olabetskyiolabetskyi
committed
Small nits
1 parent d4a936d commit 6271c02

16 files changed

Lines changed: 83 additions & 82 deletions

‎cli/cmdlineparser.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1393,17 +1393,17 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
13931393
else if (std::strncmp(argv[i], "--showtime=", 11) == 0) {
13941394
const std::string showtimeMode = argv[i] + 11;
13951395
if (showtimeMode == "file")
1396-
mSettings.showtime = SHOWTIME_MODES::SHOWTIME_FILE;
1396+
mSettings.showtime = ShowTime::FILE;
13971397
else if (showtimeMode == "file-total")
1398-
mSettings.showtime = SHOWTIME_MODES::SHOWTIME_FILE_TOTAL;
1398+
mSettings.showtime = ShowTime::FILE_TOTAL;
13991399
else if (showtimeMode == "summary")
1400-
mSettings.showtime = SHOWTIME_MODES::SHOWTIME_SUMMARY;
1400+
mSettings.showtime = ShowTime::SUMMARY;
14011401
else if (showtimeMode == "top5_file")
1402-
mSettings.showtime = SHOWTIME_MODES::SHOWTIME_TOP5_FILE;
1402+
mSettings.showtime = ShowTime::TOP5_FILE;
14031403
else if (showtimeMode == "top5_summary")
1404-
mSettings.showtime = SHOWTIME_MODES::SHOWTIME_TOP5_SUMMARY;
1404+
mSettings.showtime = ShowTime::TOP5_SUMMARY;
14051405
else if (showtimeMode == "none")
1406-
mSettings.showtime = SHOWTIME_MODES::SHOWTIME_NONE;
1406+
mSettings.showtime = ShowTime::NONE;
14071407
else if (showtimeMode.empty()) {
14081408
mLogger.printError("no mode provided for --showtime");
14091409
return Result::Fail;

‎cli/cppcheckexecutor.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ int CppCheckExecutor::check(int argc, const char* const argv[])
271271
return EXIT_SUCCESS;
272272
}
273273

274-
Timer realTimeClock(OVERALL_TIMER, settings.showtime);
274+
Timer realTimeClock(Timer::OVERALL, settings.showtime);
275275

276276
settings.loadSummaries();
277277

‎cli/processexecutor.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ unsigned int ProcessExecutor::check()
450450
}
451451

452452
// TODO: wee need to get the timing information from the subprocess
453-
if (mSettings.showtime == SHOWTIME_MODES::SHOWTIME_SUMMARY || mSettings.showtime == SHOWTIME_MODES::SHOWTIME_TOP5_SUMMARY)
453+
if (mSettings.showtime == ShowTime::SUMMARY || mSettings.showtime == ShowTime::TOP5_SUMMARY)
454454
CppCheck::printTimerResults(mSettings.showtime);
455455

456456
return result;

‎cli/singleexecutor.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ unsigned int SingleExecutor::check()
7070
if (mCppcheck.analyseWholeProgram())
7171
result++;
7272

73-
if (mSettings.showtime == SHOWTIME_MODES::SHOWTIME_SUMMARY || mSettings.showtime == SHOWTIME_MODES::SHOWTIME_TOP5_SUMMARY)
73+
if (mSettings.showtime == ShowTime::SUMMARY || mSettings.showtime == ShowTime::TOP5_SUMMARY)
7474
CppCheck::printTimerResults(mSettings.showtime);
7575

7676
return result;

‎cli/threadexecutor.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ unsigned int ThreadExecutor::check()
214214
return v + f.get();
215215
});
216216

217-
if (mSettings.showtime == SHOWTIME_MODES::SHOWTIME_SUMMARY || mSettings.showtime == SHOWTIME_MODES::SHOWTIME_TOP5_SUMMARY)
217+
if (mSettings.showtime == ShowTime::SUMMARY || mSettings.showtime == ShowTime::TOP5_SUMMARY)
218218
CppCheck::printTimerResults(mSettings.showtime);
219219

220220
return result;

‎lib/cppcheck.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1155,7 +1155,7 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str
11551155

11561156
Tokenizer tokenizer(std::move(tokenlist), mErrorLogger);
11571157
try {
1158-
if (mSettings.showtime != SHOWTIME_MODES::SHOWTIME_NONE)
1158+
if (mSettings.showtime != ShowTime::NONE)
11591159
tokenizer.setTimerResults(&s_timerResults);
11601160
tokenizer.setDirectives(directives); // TODO: how to avoid repeated copies?
11611161

@@ -1311,7 +1311,7 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str
13111311
// TODO: clear earlier?
13121312
mLogger->clear();
13131313

1314-
if (mSettings.showtime == SHOWTIME_MODES::SHOWTIME_FILE || mSettings.showtime == SHOWTIME_MODES::SHOWTIME_TOP5_FILE)
1314+
if (mSettings.showtime == ShowTime::FILE || mSettings.showtime == ShowTime::TOP5_FILE)
13151315
printTimerResults(mSettings.showtime);
13161316

13171317
return mLogger->exitcode();
@@ -1936,7 +1936,7 @@ void CppCheck::resetTimerResults()
19361936
s_timerResults.reset();
19371937
}
19381938

1939-
void CppCheck::printTimerResults(SHOWTIME_MODES mode)
1939+
void CppCheck::printTimerResults(ShowTime mode)
19401940
{
19411941
s_timerResults.showResults(mode);
19421942
}

‎lib/cppcheck.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include <vector>
3434

3535
class TokenList;
36-
enum class SHOWTIME_MODES : std::uint8_t;
36+
enum class ShowTime : std::uint8_t;
3737
struct FileSettings;
3838
class CheckUnusedFunctions;
3939
class Tokenizer;
@@ -143,7 +143,7 @@ class CPPCHECKLIB CppCheck {
143143
unsigned int analyseWholeProgram(const std::string &buildDir, const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const std::string& ctuInfo);
144144

145145
static void resetTimerResults();
146-
static void printTimerResults(SHOWTIME_MODES mode);
146+
static void printTimerResults(ShowTime mode);
147147

148148
private:
149149
void purgedConfigurationMessage(const std::string &file, const std::string& configuration);

‎lib/settings.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class Regex;
5151
#endif
5252

5353
struct Suppressions;
54-
enum class SHOWTIME_MODES : std::uint8_t;
54+
enum class ShowTime : std::uint8_t;
5555
namespace ValueFlow {
5656
class Value;
5757
}
@@ -410,7 +410,7 @@ class CPPCHECKLIB WARN_UNUSED Settings {
410410
SimpleEnableGroup<Checks> checks;
411411

412412
/** @brief show timing information (--showtime=file|summary|top5) */
413-
SHOWTIME_MODES showtime{};
413+
ShowTime showtime{};
414414

415415
/** Struct contains standards settings */
416416
Standards standards;

‎lib/timer.cpp‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
#include <utility>
2626
#include <vector>
2727

28+
constexpr char Timer::OVERALL[];
29+
2830
namespace {
2931
using dataElementType = std::pair<std::string, TimerResultsData>;
3032
bool more_second_sec(const dataElementType& lhs, const dataElementType& rhs)
@@ -38,9 +40,9 @@ namespace {
3840

3941
// TODO: this does not include any file context when SHOWTIME_FILE thus rendering it useless - should we include the logging with the progress logging?
4042
// that could also get rid of the broader locking
41-
void TimerResults::showResults(SHOWTIME_MODES mode) const
43+
void TimerResults::showResults(ShowTime mode) const
4244
{
43-
if (mode == SHOWTIME_MODES::SHOWTIME_NONE || mode == SHOWTIME_MODES::SHOWTIME_FILE_TOTAL)
45+
if (mode == ShowTime::NONE || mode == ShowTime::FILE_TOTAL)
4446
return;
4547
std::vector<dataElementType> data;
4648

@@ -61,14 +63,14 @@ void TimerResults::showResults(SHOWTIME_MODES mode) const
6163
for (auto iter=data.cbegin(); iter!=data.cend(); ++iter) {
6264
const double sec = iter->second.getSeconds().count();
6365
const double secAverage = sec / static_cast<double>(iter->second.mNumberOfResults);
64-
if ((mode != SHOWTIME_MODES::SHOWTIME_TOP5_FILE && mode != SHOWTIME_MODES::SHOWTIME_TOP5_SUMMARY) || (ordinal<=5)) {
66+
if ((mode != ShowTime::TOP5_FILE && mode != ShowTime::TOP5_SUMMARY) || (ordinal<=5)) {
6567
std::cout << iter->first << ": " << sec << "s (avg. " << secAverage << "s - " << iter->second.mNumberOfResults << " result(s))" << std::endl;
6668
}
6769
++ordinal;
6870
}
6971
}
7072

71-
void TimerResults::addResults(const std::string& str, Duration duration)
73+
void TimerResults::addResults(const std::string& str, std::chrono::milliseconds duration)
7274
{
7375
std::lock_guard<std::mutex> l(mResultsSync);
7476

@@ -82,7 +84,7 @@ void TimerResults::reset()
8284
mResults.clear();
8385
}
8486

85-
Timer::Timer(std::string str, SHOWTIME_MODES showtimeMode, TimerResultsIntf* timerResults)
87+
Timer::Timer(std::string str, ShowTime showtimeMode, TimerResultsIntf* timerResults)
8688
: mStr(std::move(str))
8789
, mTimerResults(timerResults)
8890
, mShowTimeMode(showtimeMode)
@@ -96,24 +98,25 @@ Timer::~Timer()
9698

9799
void Timer::stop()
98100
{
99-
if ((mShowTimeMode != SHOWTIME_MODES::SHOWTIME_NONE) && mStartTimePoint != TimePoint{}) {
100-
Duration diff = std::chrono::duration_cast<Duration>(Clock::now() - mStartTimePoint);
101+
if ((mShowTimeMode != ShowTime::NONE) && mStartTimePoint != TimePoint{}) {
102+
auto diff = std::chrono::duration_cast<std::chrono::milliseconds>(Clock::now() - mStartTimePoint);
101103
if (!mTimerResults) {
102-
if (mStr == OVERALL_TIMER
103-
&& (mShowTimeMode != SHOWTIME_MODES::SHOWTIME_TOP5_SUMMARY && mShowTimeMode != SHOWTIME_MODES::SHOWTIME_TOP5_FILE && mShowTimeMode != SHOWTIME_MODES::SHOWTIME_SUMMARY))
104+
if (mStr == OVERALL
105+
&& (mShowTimeMode != ShowTime::TOP5_SUMMARY && mShowTimeMode != ShowTime::TOP5_FILE && mShowTimeMode != ShowTime::SUMMARY))
104106
return;
105-
if (mStr != OVERALL_TIMER
106-
&& (mShowTimeMode != SHOWTIME_MODES::SHOWTIME_FILE && mShowTimeMode != SHOWTIME_MODES::SHOWTIME_FILE_TOTAL))
107+
if (mStr != OVERALL
108+
&& (mShowTimeMode != ShowTime::FILE && mShowTimeMode != ShowTime::FILE_TOTAL))
107109
return;
108110
std::lock_guard<std::mutex> l(stdCoutLock);
109-
std::cout << (mStr == OVERALL_TIMER ? "Overall time: " : "Check time: " + mStr + ": ")<< durationToString(diff) << std::endl;
111+
std::cout << (mStr == OVERALL ? "Overall time: " : "Check time: " + mStr + ": ")<< TimerResultsData::durationToString(diff) << std::endl;
110112
} else {
111113
mTimerResults->addResults(mStr, diff);
112114
}
113115
}
116+
mShowTimeMode = ShowTime::NONE; // prevent multiple stops
114117
}
115118

116-
std::string Timer::durationToString(Duration duration)
119+
std::string TimerResultsData::durationToString(std::chrono::milliseconds duration)
117120
{
118121
// Extract hours
119122
auto hours = std::chrono::duration_cast<std::chrono::hours>(duration);

‎lib/timer.h‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -31,43 +31,39 @@
3131
#include <string>
3232
#include <utility>
3333

34-
using Clock = std::chrono::high_resolution_clock;
35-
using TimePoint = std::chrono::time_point<Clock>;
36-
using Duration = std::chrono::milliseconds;
37-
38-
static constexpr char OVERALL_TIMER[] = "Summary";
39-
40-
enum class SHOWTIME_MODES : std::uint8_t {
41-
SHOWTIME_NONE,
42-
SHOWTIME_FILE,
43-
SHOWTIME_FILE_TOTAL,
44-
SHOWTIME_SUMMARY,
45-
SHOWTIME_TOP5_SUMMARY,
46-
SHOWTIME_TOP5_FILE
34+
enum class ShowTime : std::uint8_t {
35+
NONE,
36+
FILE,
37+
FILE_TOTAL,
38+
SUMMARY,
39+
TOP5_SUMMARY,
40+
TOP5_FILE
4741
};
4842

4943
class CPPCHECKLIB TimerResultsIntf {
5044
public:
5145
virtual ~TimerResultsIntf() = default;
5246

53-
virtual void addResults(const std::string& timerName, Duration duation) = 0;
47+
virtual void addResults(const std::string& timerName, std::chrono::milliseconds duation) = 0;
5448
};
5549

5650
struct TimerResultsData {
57-
Duration mDuration;
51+
std::chrono::milliseconds mDuration;
5852
long mNumberOfResults{};
5953

6054
std::chrono::duration<double> getSeconds() const {
6155
return std::chrono::duration_cast<std::chrono::duration<double>>(mDuration);
6256
}
57+
58+
static std::string durationToString(std::chrono::milliseconds duration);
6359
};
6460

6561
class CPPCHECKLIB TimerResults : public TimerResultsIntf {
6662
public:
6763
TimerResults() = default;
6864

69-
void showResults(SHOWTIME_MODES mode) const;
70-
void addResults(const std::string& str, Duration duration) override;
65+
void showResults(ShowTime mode) const;
66+
void addResults(const std::string& str, std::chrono::milliseconds duration) override;
7167

7268
void reset();
7369

@@ -78,25 +74,27 @@ class CPPCHECKLIB TimerResults : public TimerResultsIntf {
7874

7975
class CPPCHECKLIB Timer {
8076
public:
81-
Timer(std::string str, SHOWTIME_MODES showtimeMode, TimerResultsIntf* timerResults = nullptr);
77+
static constexpr char OVERALL[] = "Summary";
78+
using Clock = std::chrono::high_resolution_clock;
79+
using TimePoint = std::chrono::time_point<Clock>;
80+
81+
Timer(std::string str, ShowTime showtimeMode, TimerResultsIntf* timerResults = nullptr);
8282
~Timer();
8383

8484
Timer(const Timer&) = delete;
8585
Timer& operator=(const Timer&) = delete;
8686

8787
void stop();
8888

89-
static std::string durationToString(Duration duration);
90-
91-
static void run(std::string str, SHOWTIME_MODES showtimeMode, TimerResultsIntf* timerResults, const std::function<void()>& f) {
89+
static void run(std::string str, ShowTime showtimeMode, TimerResultsIntf* timerResults, const std::function<void()>& f) {
9290
Timer t(std::move(str), showtimeMode, timerResults);
9391
f();
9492
}
9593

9694
private:
9795
const std::string mStr;
9896
TimerResultsIntf* mTimerResults{};
99-
const SHOWTIME_MODES mShowTimeMode = SHOWTIME_MODES::SHOWTIME_FILE_TOTAL;
97+
ShowTime mShowTimeMode = ShowTime::FILE_TOTAL;
10098
TimePoint mStartTimePoint;
10199
};
102100

0 commit comments

Comments
 (0)