KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 3 Releases Wiki Activity

WIP: somethings wrong.. #19

Closed
muellerr wants to merge 808 commits from source/master into master
pull from: source/master
merge into: KSat:master
Conversation 0 Commits 808 Files Changed 512 +22 -8
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit da9bb97b23 - Show all commits

12
timemanager/Stopwatch.cpp
View File

@ -6,10 +6,11 @@
#include <framework/timemanager/Stopwatch.h> #include <framework/timemanager/Stopwatch.h>
#include <framework/serviceinterface/ServiceInterfaceStream.h> #include <framework/serviceinterface/ServiceInterfaceStream.h>
#include <iomanip>
Stopwatch::Stopwatch(bool displayOnDestruction, Stopwatch::Stopwatch(bool displayOnDestruction,
StopwatchDisplayMode displayMode): StopwatchDisplayMode displayMode, uint8_t precision):
displayOnDestruction(displayOnDestruction) { displayOnDestruction(displayOnDestruction), outputPrecision(precision) {
// Measures start time on initialization. // Measures start time on initialization.
Clock::getUptime(&startTime); Clock::getUptime(&startTime);
} }
@ -31,8 +32,9 @@ ms_double_t Stopwatch::stopPrecise() {
void Stopwatch::display() { void Stopwatch::display() {
if(displayMode == StopwatchDisplayMode::MS_DOUBLE) { if(displayMode == StopwatchDisplayMode::MS_DOUBLE) {
info << "Stopwatch: Operation took " << info << "Stopwatch: Operation took "
elapsedTimeMsDouble << " milliseconds" << std::endl; << std::setprecision(outputPrecision) << elapsedTimeMsDouble
<< " milliseconds" << std::endl;
} }
else { else {
info << "Stopwatch: Operation took " << elapsedTime.tv_sec * 1000 + info << "Stopwatch: Operation took " << elapsedTime.tv_sec * 1000 +
@ -56,6 +58,8 @@ StopwatchDisplayMode Stopwatch::getDisplayMode() const {
return displayMode; return displayMode;
} }
void Stopwatch::stopInternal() { void Stopwatch::stopInternal() {
elapsedTime = Clock::getUptime() - startTime; elapsedTime = Clock::getUptime() - startTime;
elapsedTimeMsDouble = timevalOperations::toDouble(elapsedTime) * 1000.0; elapsedTimeMsDouble = timevalOperations::toDouble(elapsedTime) * 1000.0;

18
timemanager/Stopwatch.h
View File

@ -22,9 +22,19 @@ enum class StopwatchDisplayMode {
* as a float. * as a float.
*/ */
class Stopwatch { class Stopwatch {
public:
/**
* Default constructor. Call "Stopwatch stopwatch" without brackets if
* no parameters are required!
* @param displayOnDestruction If set to true, displays measured time on
* object destruction
* @param displayMode Display format is either MS rounded or MS as double
* format
* @param outputPrecision If using double format, specify precision here.
*/
Stopwatch(bool displayOnDestruction = true, Stopwatch(bool displayOnDestruction = true,
StopwatchDisplayMode displayMode = StopwatchDisplayMode::MS_DOUBLE); StopwatchDisplayMode displayMode = StopwatchDisplayMode::MS_DOUBLE,
uint8_t outputPrecision = 4);
virtual~ Stopwatch(); virtual~ Stopwatch();
/** /**
@ -53,12 +63,12 @@ class Stopwatch {
StopwatchDisplayMode getDisplayMode() const; StopwatchDisplayMode getDisplayMode() const;
void setDisplayMode(StopwatchDisplayMode displayMode); void setDisplayMode(StopwatchDisplayMode displayMode);
private: private:
timeval startTime {0, 0}; timeval startTime {0, 0};
timeval elapsedTime {0, 0}; timeval elapsedTime {0, 0};
double elapsedTimeMsDouble = 0; double elapsedTimeMsDouble {0.0};
bool displayOnDestruction = true; bool displayOnDestruction = true;
uint8_t outputPrecision = 4;
StopwatchDisplayMode displayMode = StopwatchDisplayMode::MS_DOUBLE; StopwatchDisplayMode displayMode = StopwatchDisplayMode::MS_DOUBLE;
void stopInternal(); void stopInternal();