Uh oh!
There was an error while loading. Please reload this page.
refs #4452 / refs #11705 - improved --showtime= behavior and testing#4876
Uh oh!
There was an error while loading. Please reload this page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -24,38 +24,41 @@ | ||
| #include <iostream> | ||
| #include <utility> | ||
| #include <vector> | ||
firewave marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| namespace { | ||
| using dataElementType = std::pair<std::string, struct TimerResultsData>; | ||
| bool more_second_sec(const dataElementType& lhs, const dataElementType& rhs) | ||
| { | ||
| return lhs.second.seconds() > rhs.second.seconds(); | ||
| } | ||
| // TODO: remove and print through (synchronized) ErrorLogger instead | ||
| std::mutex stdCoutLock; | ||
| } | ||
| // TODO: this does not include any file context when SHOWTIME_FILE thus rendering it useless - should we include the logging with the progress logging? | ||
CollaboratorAuthor There was a problem hiding this comment. This would also be without context when using | ||
| // that could also get rid of the broader locking | ||
| void TimerResults::showResults(SHOWTIME_MODES mode) const | ||
| { | ||
| if (mode == SHOWTIME_MODES::SHOWTIME_NONE || mode == SHOWTIME_MODES::SHOWTIME_FILE_TOTAL) | ||
| return; | ||
| TimerResultsData overallData; | ||
| std::vector<dataElementType> data; | ||
| { | ||
| std::lock_guard<std::mutex> l(mResultsSync); | ||
| data.reserve(mResults.size()); | ||
| data.insert(data.begin(), mResults.cbegin(), mResults.cend()); | ||
| } | ||
| std::sort(data.begin(), data.end(), more_second_sec); | ||
| // lock the whole logging operation to avoid multiple threads printing their results at the same time | ||
| std::lock_guard<std::mutex> l(stdCoutLock); | ||
| std::cout << std::endl; | ||
| size_t ordinal = 1; // maybe it would be nice to have an ordinal in output later! | ||
| for (std::vector<dataElementType>::const_iterator iter=data.cbegin(); iter!=data.cend(); ++iter) { | ||
| const double sec = iter->second.seconds(); | ||
| @@ -75,7 +78,7 @@ void TimerResults::showResults(SHOWTIME_MODES mode) const | ||
| } | ||
| if (!hasParent) | ||
| overallData.mClocks += iter->second.mClocks; | ||
| if ((mode != SHOWTIME_MODES::SHOWTIME_TOP5_FILE && mode != SHOWTIME_MODES::SHOWTIME_TOP5_SUMMARY) || (ordinal<=5)) { | ||
| std::cout << iter->first << ": " << sec << "s (avg. " << secAverage << "s - " << iter->second.mNumberOfResults << " result(s))" << std::endl; | ||
| } | ||
| ++ordinal; | ||
| @@ -93,6 +96,12 @@ void TimerResults::addResults(const std::string& str, std::clock_t clocks) | ||
| mResults[str].mNumberOfResults++; | ||
| } | ||
| void TimerResults::reset() | ||
| { | ||
| std::lock_guard<std::mutex> l(mResultsSync); | ||
| mResults.clear(); | ||
| } | ||
| Timer::Timer(std::string str, SHOWTIME_MODES showtimeMode, TimerResultsIntf* timerResults) | ||
| : mStr(std::move(str)) | ||
| , mTimerResults(timerResults) | ||
| @@ -119,9 +128,11 @@ void Timer::stop() | ||
| if (mShowTimeMode == SHOWTIME_MODES::SHOWTIME_FILE) { | ||
| const double sec = (double)diff / CLOCKS_PER_SEC; | ||
| std::lock_guard<std::mutex> l(stdCoutLock); | ||
| std::cout << mStr << ": " << sec << "s" << std::endl; | ||
| } else if (mShowTimeMode == SHOWTIME_MODES::SHOWTIME_FILE_TOTAL) { | ||
| const double sec = (double)diff / CLOCKS_PER_SEC; | ||
| std::lock_guard<std::mutex> l(stdCoutLock); | ||
| std::cout << "Check time: " << mStr << ": " << sec << "s" << std::endl; | ||
| } else { | ||
| if (mTimerResults) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
spelling: wee => we