Browse Source

DebugTools: rename function/test to match the use better.

pull/442/head
Vladimír Vondruš 6 years ago
parent
commit
be9a782272
  1. 6
      src/Magnum/DebugTools/FrameProfiler.cpp
  2. 2
      src/Magnum/DebugTools/FrameProfiler.h
  3. 6
      src/Magnum/DebugTools/Test/FrameProfilerTest.cpp

6
src/Magnum/DebugTools/FrameProfiler.cpp

@ -277,7 +277,7 @@ bool FrameProfiler::isMeasurementAvailable(const UnsignedInt id) const {
return _measuredFrameCount >= Math::max(_measurements[id]._delay, 1u); return _measuredFrameCount >= Math::max(_measurements[id]._delay, 1u);
} }
Double FrameProfiler::measurementDataInternal(const Measurement& measurement) const { Double FrameProfiler::measurementMeanInternal(const Measurement& measurement) const {
return Double(measurement._movingSum)/ return Double(measurement._movingSum)/
Math::min(_measuredFrameCount - Math::max(measurement._delay, 1u) + 1, _maxFrameCount); Math::min(_measuredFrameCount - Math::max(measurement._delay, 1u) + 1, _maxFrameCount);
} }
@ -287,7 +287,7 @@ Double FrameProfiler::measurementMean(const UnsignedInt id) const {
"DebugTools::FrameProfiler::measurementMean(): index" << id << "out of range for" << _measurements.size() << "measurements", {}); "DebugTools::FrameProfiler::measurementMean(): index" << id << "out of range for" << _measurements.size() << "measurements", {});
CORRADE_ASSERT(_measuredFrameCount >= Math::max(_measurements[id]._delay, 1u), "DebugTools::FrameProfiler::measurementMean(): measurement data available after" << Math::max(_measurements[id]._delay, 1u) - _measuredFrameCount << "more frames", {}); CORRADE_ASSERT(_measuredFrameCount >= Math::max(_measurements[id]._delay, 1u), "DebugTools::FrameProfiler::measurementMean(): measurement data available after" << Math::max(_measurements[id]._delay, 1u) - _measuredFrameCount << "more frames", {});
return measurementDataInternal(_measurements[id]); return measurementMeanInternal(_measurements[id]);
} }
namespace { namespace {
@ -360,7 +360,7 @@ void FrameProfiler::printStatisticsInternal(Debug& out) const {
/* Otherwise format the value */ /* Otherwise format the value */
} else { } else {
const Double mean = measurementDataInternal(measurement); const Double mean = measurementMeanInternal(measurement);
switch(measurement._units) { switch(measurement._units) {
case Units::Nanoseconds: case Units::Nanoseconds:
printTime(out, mean); printTime(out, mean);

2
src/Magnum/DebugTools/FrameProfiler.h

@ -380,7 +380,7 @@ class MAGNUM_DEBUGTOOLS_EXPORT FrameProfiler {
private: private:
UnsignedInt delayedCurrentData(UnsignedInt delay) const; UnsignedInt delayedCurrentData(UnsignedInt delay) const;
Double measurementDataInternal(const Measurement& measurement) const; Double measurementMeanInternal(const Measurement& measurement) const;
void printStatisticsInternal(Debug& out) const; void printStatisticsInternal(Debug& out) const;
bool _enabled = true; bool _enabled = true;

6
src/Magnum/DebugTools/Test/FrameProfilerTest.cpp

@ -55,7 +55,7 @@ struct FrameProfilerTest: TestSuite::Tester {
void delayTooLittleFrames(); void delayTooLittleFrames();
void startStopFrameUnexpected(); void startStopFrameUnexpected();
void measurementOutOfBounds(); void measurementOutOfBounds();
void dataNotAvailableYet(); void meanNotAvailableYet();
void statistics(); void statistics();
@ -127,7 +127,7 @@ FrameProfilerTest::FrameProfilerTest() {
&FrameProfilerTest::delayTooLittleFrames, &FrameProfilerTest::delayTooLittleFrames,
&FrameProfilerTest::startStopFrameUnexpected, &FrameProfilerTest::startStopFrameUnexpected,
&FrameProfilerTest::measurementOutOfBounds, &FrameProfilerTest::measurementOutOfBounds,
&FrameProfilerTest::dataNotAvailableYet, &FrameProfilerTest::meanNotAvailableYet,
&FrameProfilerTest::statistics}); &FrameProfilerTest::statistics});
@ -800,7 +800,7 @@ void FrameProfilerTest::measurementOutOfBounds() {
"DebugTools::FrameProfiler::measurementMean(): index 2 out of range for 2 measurements\n"); "DebugTools::FrameProfiler::measurementMean(): index 2 out of range for 2 measurements\n");
} }
void FrameProfilerTest::dataNotAvailableYet() { void FrameProfilerTest::meanNotAvailableYet() {
#ifdef CORRADE_NO_ASSERT #ifdef CORRADE_NO_ASSERT
CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions");
#endif #endif

Loading…
Cancel
Save