From 0967b8642751a4431152d41f060911cf77346bbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Radovan=20=C4=8Cerven=C3=BD?= <radovan.cerveny@gmail.com>
Date: Mon, 21 Mar 2016 17:26:55 +0100
Subject: [PATCH] unified coding style, stylistic changes
---
alib2common/src/allocator/StealthTypes.cpp | 2 +-
alib2common/src/allocator/StealthTypes.hpp | 2 +-
.../src/measurements/MeasurementEngine.cpp | 49 +++++++--------
.../src/measurements/MeasurementEngine.hpp | 10 ++--
.../src/measurements/MeasurementFrame.cpp | 8 +--
.../src/measurements/MeasurementFrame.hpp | 4 +-
.../src/measurements/MeasurementResults.cpp | 48 +++++++--------
.../src/measurements/MeasurementResults.hpp | 8 +--
.../measurements/MeasurementResultsXml.cpp | 36 +++++------
.../src/measurements/MeasurementTypes.cpp | 13 ++--
.../src/measurements/MeasurementTypes.hpp | 3 +-
.../measurements/frames/CounterDataFrame.cpp | 31 +++++-----
.../measurements/frames/CounterDataFrame.hpp | 2 +-
.../measurements/frames/MemoryDataFrame.cpp | 60 +++++++++----------
.../measurements/frames/MemoryDataFrame.hpp | 10 ++--
.../src/measurements/frames/TimeDataFrame.cpp | 25 ++++----
.../src/measurements/frames/TimeDataFrame.hpp | 2 +-
alib2common/src/measurements/measurements.cpp | 8 +--
.../src/processor/MeasurementProcessor.cpp | 12 ++--
.../processor/MeasurementProcessorOutput.cpp | 10 +---
.../provisioner/MeasurementProvisioner.cpp | 2 +-
21 files changed, 174 insertions(+), 171 deletions(-)
diff --git a/alib2common/src/allocator/StealthTypes.cpp b/alib2common/src/allocator/StealthTypes.cpp
index 66dfd0ac42..b027c9a217 100644
--- a/alib2common/src/allocator/StealthTypes.cpp
+++ b/alib2common/src/allocator/StealthTypes.cpp
@@ -13,7 +13,7 @@ std::string to_string ( stealth_string & ss ) {
return ss.c_str ( );
}
-stealth_string stealth_string_from_string ( const std::string & str ) {
+stealth_string stealthStringFromString ( const std::string & str ) {
return stealth_string ( str.c_str ( ) );
}
diff --git a/alib2common/src/allocator/StealthTypes.hpp b/alib2common/src/allocator/StealthTypes.hpp
index 21061661c2..76956a1bed 100644
--- a/alib2common/src/allocator/StealthTypes.hpp
+++ b/alib2common/src/allocator/StealthTypes.hpp
@@ -17,7 +17,7 @@ using stealth_string = std::basic_string < char, std::char_traits < char >, stea
std::string to_string ( const stealth_string & );
std::string to_string ( stealth_string & );
-stealth_string stealth_string_from_string ( const std::string & );
+stealth_string stealthStringFromString ( const std::string & );
template < typename T >
using stealth_vector = std::vector < T, stealth_allocator < T > >;
diff --git a/alib2common/src/measurements/MeasurementEngine.cpp b/alib2common/src/measurements/MeasurementEngine.cpp
index 19fac66b96..e88b935134 100644
--- a/alib2common/src/measurements/MeasurementEngine.cpp
+++ b/alib2common/src/measurements/MeasurementEngine.cpp
@@ -3,6 +3,7 @@
*/
#include "MeasurementEngine.hpp"
+#include "../exception/CommonException.h"
namespace measurements {
@@ -12,63 +13,63 @@ bool MeasurementEngine::OPERATIONAL;
MeasurementEngine::MeasurementEngine ( ) {
MeasurementEngine::OPERATIONAL = true;
- reset_measurements ( );
+ resetMeasurements ( );
}
MeasurementEngine::~MeasurementEngine ( ) {
MeasurementEngine::OPERATIONAL = false;
}
-void MeasurementEngine::push_measurement_frame ( measurements::stealth_string frame_name, measurements::Type frame_type ) {
- unsigned parent_idx = frame_idx_stack.back ( );
+void MeasurementEngine::pushMeasurementFrame ( measurements::stealth_string frameName, measurements::Type frameType ) {
+ unsigned parentIdx = frameIdxStack.back ( );
- frames.emplace_back ( std::move ( frame_name ), frame_type, parent_idx );
+ frames.emplace_back ( std::move ( frameName ), frameType, parentIdx );
- unsigned current_idx = frames.size ( ) - 1;
+ unsigned currentIdx = frames.size ( ) - 1;
- frames[parent_idx].sub_idxs.push_back ( current_idx );
+ frames[parentIdx].subIdxs.push_back ( currentIdx );
- frame_idx_stack.push_back ( current_idx );
+ frameIdxStack.push_back ( currentIdx );
- TimeDataFrame::init ( current_idx, frames );
- MemoryDataFrame::init ( current_idx, frames );
- CounterDataFrame::init ( current_idx, frames );
+ TimeDataFrame::init ( currentIdx, frames );
+ MemoryDataFrame::init ( currentIdx, frames );
+ CounterDataFrame::init ( currentIdx, frames );
}
-void MeasurementEngine::pop_measurement_frame ( ) {
- unsigned current_idx = frame_idx_stack.back ( );
+void MeasurementEngine::popMeasurementFrame ( ) {
+ unsigned currentIdx = frameIdxStack.back ( );
- if ( frames[current_idx].type == measurements::Type::ROOT )
- throw std::logic_error ( "no measurement started" );
+ if ( frames[currentIdx].type == measurements::Type::ROOT )
+ throw::exception::CommonException ( "MeasurementEngine: popMeasurementFrame failed, no measurements started" );
- frame_idx_stack.pop_back ( );
+ frameIdxStack.pop_back ( );
- TimeDataFrame::update ( current_idx, frames );
- MemoryDataFrame::update ( current_idx, frames );
- CounterDataFrame::update ( current_idx, frames );
+ TimeDataFrame::update ( currentIdx, frames );
+ MemoryDataFrame::update ( currentIdx, frames );
+ CounterDataFrame::update ( currentIdx, frames );
}
-void MeasurementEngine::reset_measurements ( ) {
+void MeasurementEngine::resetMeasurements ( ) {
frames.clear ( );
- frame_idx_stack.clear ( );
+ frameIdxStack.clear ( );
frames.emplace_back ( "Root", measurements::Type::ROOT, 0 );
- frame_idx_stack.push_back ( 0 );
+ frameIdxStack.push_back ( 0 );
TimeDataFrame::init ( 0, frames );
MemoryDataFrame::init ( 0, frames );
CounterDataFrame::init ( 0, frames );
}
-MeasurementResults MeasurementEngine::get_results ( ) const {
+MeasurementResults MeasurementEngine::getResults ( ) const {
return MeasurementResults ( frames );
}
template < typename Hint >
void MeasurementEngine::hint ( Hint hint ) {
- if ( ( frame_idx_stack.size ( ) == 0 ) ) return;
+ if ( ( frameIdxStack.size ( ) == 0 ) ) return;
- Hint::frame_type::hint ( frame_idx_stack.back ( ), frames, std::move ( hint ) );
+ Hint::frame_type::hint ( frameIdxStack.back ( ), frames, std::move ( hint ) );
}
template void MeasurementEngine::hint < MemoryHint > ( MemoryHint );
diff --git a/alib2common/src/measurements/MeasurementEngine.hpp b/alib2common/src/measurements/MeasurementEngine.hpp
index 721e101060..b81f983ec4 100644
--- a/alib2common/src/measurements/MeasurementEngine.hpp
+++ b/alib2common/src/measurements/MeasurementEngine.hpp
@@ -12,16 +12,16 @@
namespace measurements {
class MeasurementEngine {
- measurements::stealth_vector < unsigned > frame_idx_stack;
+ measurements::stealth_vector < unsigned > frameIdxStack;
measurements::stealth_vector < MeasurementFrame > frames;
MeasurementEngine ( );
public:
- void push_measurement_frame ( measurements::stealth_string, measurements::Type );
- void pop_measurement_frame ( );
- void reset_measurements ( );
- MeasurementResults get_results ( ) const;
+ void pushMeasurementFrame ( measurements::stealth_string, measurements::Type );
+ void popMeasurementFrame ( );
+ void resetMeasurements ( );
+ MeasurementResults getResults ( ) const;
template < typename Hint >
void hint ( Hint );
diff --git a/alib2common/src/measurements/MeasurementFrame.cpp b/alib2common/src/measurements/MeasurementFrame.cpp
index b79de7a4e4..0d2cc03e55 100644
--- a/alib2common/src/measurements/MeasurementFrame.cpp
+++ b/alib2common/src/measurements/MeasurementFrame.cpp
@@ -7,7 +7,7 @@
namespace measurements {
-MeasurementFrame::MeasurementFrame ( measurements::stealth_string name, measurements::Type type, unsigned parent_idx ) : name ( std::move ( name ) ), type ( type ), parent_idx ( parent_idx ), time ( ), memory ( ) {
+MeasurementFrame::MeasurementFrame ( measurements::stealth_string name, measurements::Type type, unsigned parentIdx ) : name ( std::move ( name ) ), type ( type ), parentIdx ( parentIdx ), time ( ), memory ( ) {
}
std::ostream & operator <<( std::ostream & os, const MeasurementFrame & frame ) {
@@ -16,14 +16,14 @@ std::ostream & operator <<( std::ostream & os, const MeasurementFrame & frame )
ss << "(TIME: " << frame.time << "), (MEM: " << frame.memory << "), (COUNTER: " << frame.counter << ")";
- os << std::make_tuple ( frame.name, frame.type, frame.parent_idx, frame.sub_idxs, ss.str ( ) );
+ os << std::make_tuple ( frame.name, frame.type, frame.parentIdx, frame.subIdxs, ss.str ( ) );
return os;
}
MeasurementFrame MeasurementFrame::aggregate ( const std::vector < MeasurementFrame > & framesToAggregate ) {
- MeasurementFrame aggregatedFrame ( framesToAggregate[0].name, framesToAggregate[0].type, framesToAggregate[0].parent_idx );
+ MeasurementFrame aggregatedFrame ( framesToAggregate[0].name, framesToAggregate[0].type, framesToAggregate[0].parentIdx );
- aggregatedFrame.sub_idxs = framesToAggregate[0].sub_idxs;
+ aggregatedFrame.subIdxs = framesToAggregate[0].subIdxs;
aggregatedFrame.time = TimeDataFrame::aggregate ( framesToAggregate );
aggregatedFrame.memory = MemoryDataFrame::aggregate ( framesToAggregate );
diff --git a/alib2common/src/measurements/MeasurementFrame.hpp b/alib2common/src/measurements/MeasurementFrame.hpp
index 5998f89403..adb1189f35 100644
--- a/alib2common/src/measurements/MeasurementFrame.hpp
+++ b/alib2common/src/measurements/MeasurementFrame.hpp
@@ -19,9 +19,9 @@ namespace measurements {
struct MeasurementFrame {
measurements::stealth_string name;
measurements::Type type;
- unsigned parent_idx;
+ unsigned parentIdx;
- measurements::stealth_vector < unsigned > sub_idxs;
+ measurements::stealth_vector < unsigned > subIdxs;
TimeDataFrame time;
MemoryDataFrame memory;
diff --git a/alib2common/src/measurements/MeasurementResults.cpp b/alib2common/src/measurements/MeasurementResults.cpp
index df4444896d..6456339dd4 100644
--- a/alib2common/src/measurements/MeasurementResults.cpp
+++ b/alib2common/src/measurements/MeasurementResults.cpp
@@ -12,11 +12,11 @@ MeasurementResults::MeasurementResults ( ) {
MeasurementResults::MeasurementResults ( const measurements::stealth_vector < MeasurementFrame > & frames ) : frames ( frames ) {
}
-void MeasurementResults::print_as_list ( std::ostream & os ) const {
- print_as_list ( os, 0 );
+void MeasurementResults::printAsList ( std::ostream & os ) const {
+ printAsList ( os, 0 );
}
-void MeasurementResults::print_as_list ( std::ostream & os, unsigned idx ) const {
+void MeasurementResults::printAsList ( std::ostream & os, unsigned idx ) const {
const MeasurementFrame & frame = frames[idx];
if ( frame.type != measurements::Type::ROOT ) {
@@ -26,67 +26,67 @@ void MeasurementResults::print_as_list ( std::ostream & os, unsigned idx ) const
os << ", ";
}
- for ( unsigned sub_idx : frame.sub_idxs )
- print_as_list ( os, sub_idx );
+ for ( unsigned subIdx : frame.subIdxs )
+ printAsList ( os, subIdx );
}
-void MeasurementResults::print_as_tree ( std::ostream & os ) const {
+void MeasurementResults::printAsTree ( std::ostream & os ) const {
std::string prefix;
- print_as_tree ( os, 0, prefix, false );
+ printAsTree ( os, 0, prefix, false );
}
-void MeasurementResults::print_as_tree ( std::ostream & os, unsigned idx, std::string & prefix, bool last_in_parent ) const {
+void MeasurementResults::printAsTree ( std::ostream & os, unsigned idx, std::string & prefix, bool lastInParent ) const {
const MeasurementFrame & frame = frames[idx];
if ( frame.type == measurements::Type::ROOT ) {
- if ( frame.sub_idxs.size ( ) ) {
+ if ( frame.subIdxs.size ( ) ) {
prefix = "|-";
- last_in_parent = false;
+ lastInParent = false;
- for ( unsigned sub_idx : frame.sub_idxs ) {
+ for ( unsigned subIdx : frame.subIdxs ) {
prefix[prefix.size ( ) - 2] = '|';
prefix[prefix.size ( ) - 1] = '-';
- if ( sub_idx == frame.sub_idxs.front ( ) )
+ if ( subIdx == frame.subIdxs.front ( ) )
prefix[prefix.size ( ) - 2] = '+';
- if ( sub_idx == frame.sub_idxs.back ( ) ) {
+ if ( subIdx == frame.subIdxs.back ( ) ) {
prefix[prefix.size ( ) - 2] = '\\';
- last_in_parent = true;
+ lastInParent = true;
}
- print_as_tree ( os, sub_idx, prefix, last_in_parent );
+ printAsTree ( os, subIdx, prefix, lastInParent );
}
}
} else {
- if ( frame.sub_idxs.size ( ) ) {
+ if ( frame.subIdxs.size ( ) ) {
prefix += '+';
os << prefix << frame << std::endl;
prefix += '-';
prefix[prefix.size ( ) - 3] = ' ';
- if ( last_in_parent )
+ if ( lastInParent )
prefix[prefix.size ( ) - 4] = ' ';
else
prefix[prefix.size ( ) - 4] = '|';
- last_in_parent = false;
+ lastInParent = false;
- for ( unsigned sub_idx : frame.sub_idxs ) {
+ for ( unsigned subIdx : frame.subIdxs ) {
prefix[prefix.size ( ) - 2] = '|';
prefix[prefix.size ( ) - 1] = '-';
- if ( sub_idx == frame.sub_idxs.back ( ) ) {
+ if ( subIdx == frame.subIdxs.back ( ) ) {
prefix[prefix.size ( ) - 2] = '\\';
- last_in_parent = true;
+ lastInParent = true;
}
- print_as_tree ( os, sub_idx, prefix, last_in_parent );
+ printAsTree ( os, subIdx, prefix, lastInParent );
}
prefix.erase ( prefix.size ( ) - 2 );
@@ -127,11 +127,11 @@ std::ostream & operator <<( std::ostream & os, const MeasurementResults & mr ) {
switch ( mf ) {
case MeasurementFormat::LIST:
- mr.print_as_list ( os );
+ mr.printAsList ( os );
break;
case MeasurementFormat::TREE:
- mr.print_as_tree ( os );
+ mr.printAsTree ( os );
break;
case MeasurementFormat::XML:
diff --git a/alib2common/src/measurements/MeasurementResults.hpp b/alib2common/src/measurements/MeasurementResults.hpp
index 62a4088b03..fcc68ae666 100644
--- a/alib2common/src/measurements/MeasurementResults.hpp
+++ b/alib2common/src/measurements/MeasurementResults.hpp
@@ -26,14 +26,14 @@ struct MeasurementResults {
MeasurementResults ( );
MeasurementResults ( const measurements::stealth_vector < MeasurementFrame > & );
- void print_as_list ( std::ostream & ) const;
- void print_as_tree ( std::ostream & ) const;
+ void printAsList ( std::ostream & ) const;
+ void printAsTree ( std::ostream & ) const;
static MeasurementResults aggregate ( const std::vector < MeasurementResults > & );
private:
- void print_as_list ( std::ostream &, unsigned ) const;
- void print_as_tree ( std::ostream &, unsigned, std::string &, bool ) const;
+ void printAsList ( std::ostream &, unsigned ) const;
+ void printAsTree ( std::ostream &, unsigned, std::string &, bool ) const;
};
std::ostream & operator <<( std::ostream &, const MeasurementResults & );
diff --git a/alib2common/src/measurements/MeasurementResultsXml.cpp b/alib2common/src/measurements/MeasurementResultsXml.cpp
index 8c541a2cbe..44fbf895e4 100644
--- a/alib2common/src/measurements/MeasurementResultsXml.cpp
+++ b/alib2common/src/measurements/MeasurementResultsXml.cpp
@@ -45,8 +45,8 @@ void MeasurementResultsXml::composeMeasurementFrames ( deque < Token > & tokens,
tokens.emplace_back ( MEASUREMENT_SUBFRAMES_TAG, Token::TokenType::START_ELEMENT );
- for ( unsigned sub_idx : frame.sub_idxs )
- composeMeasurementFrames ( tokens, sub_idx, frames );
+ for ( unsigned subIdx : frame.subIdxs )
+ composeMeasurementFrames ( tokens, subIdx, frames );
tokens.emplace_back ( MEASUREMENT_SUBFRAMES_TAG, Token::TokenType::END_ELEMENT );
@@ -61,7 +61,7 @@ void MeasurementResultsXml::composeTimeDataFrame ( deque < Token > & tokens, uns
tokens.emplace_back ( std::to_string ( frame.duration.count ( ) ), Token::TokenType::CHARACTER );
tokens.emplace_back ( TIME_DATA_FRAME_DURATION_TAG, Token::TokenType::END_ELEMENT );
tokens.emplace_back ( TIME_DATA_FRAME_IN_FRAME_DURATION_TAG, Token::TokenType::START_ELEMENT );
- tokens.emplace_back ( std::to_string ( frame.in_frame_duration.count ( ) ), Token::TokenType::CHARACTER );
+ tokens.emplace_back ( std::to_string ( frame.inFrameDuration.count ( ) ), Token::TokenType::CHARACTER );
tokens.emplace_back ( TIME_DATA_FRAME_IN_FRAME_DURATION_TAG, Token::TokenType::END_ELEMENT );
tokens.emplace_back ( TIME_DATA_FRAME_TAG, Token::TokenType::END_ELEMENT );
}
@@ -71,16 +71,16 @@ void MeasurementResultsXml::composeMemoryDataFrame ( deque < Token > & tokens, u
tokens.emplace_back ( MEMORY_DATA_FRAME_TAG, Token::TokenType::START_ELEMENT );
tokens.emplace_back ( MEMORY_DATA_FRAME_START_HEAP_USAGE_TAG, Token::TokenType::START_ELEMENT );
- tokens.emplace_back ( std::to_string ( frame.start_heap_usage ), Token::TokenType::CHARACTER );
+ tokens.emplace_back ( std::to_string ( frame.startHeapUsage ), Token::TokenType::CHARACTER );
tokens.emplace_back ( MEMORY_DATA_FRAME_START_HEAP_USAGE_TAG, Token::TokenType::END_ELEMENT );
tokens.emplace_back ( MEMORY_DATA_FRAME_END_HEAP_USAGE_TAG, Token::TokenType::START_ELEMENT );
- tokens.emplace_back ( std::to_string ( frame.end_heap_usage ), Token::TokenType::CHARACTER );
+ tokens.emplace_back ( std::to_string ( frame.endHeapUsage ), Token::TokenType::CHARACTER );
tokens.emplace_back ( MEMORY_DATA_FRAME_END_HEAP_USAGE_TAG, Token::TokenType::END_ELEMENT );
tokens.emplace_back ( MEMORY_DATA_FRAME_HIGH_WATERMARK_TAG, Token::TokenType::START_ELEMENT );
- tokens.emplace_back ( std::to_string ( frame.high_watermark ), Token::TokenType::CHARACTER );
+ tokens.emplace_back ( std::to_string ( frame.highWatermark ), Token::TokenType::CHARACTER );
tokens.emplace_back ( MEMORY_DATA_FRAME_HIGH_WATERMARK_TAG, Token::TokenType::END_ELEMENT );
tokens.emplace_back ( MEMORY_DATA_FRAME_IN_FRAME_HIGH_WATERMARK_TAG, Token::TokenType::START_ELEMENT );
- tokens.emplace_back ( std::to_string ( frame.in_frame_high_watermark ), Token::TokenType::CHARACTER );
+ tokens.emplace_back ( std::to_string ( frame.inFrameHighWatermark ), Token::TokenType::CHARACTER );
tokens.emplace_back ( MEMORY_DATA_FRAME_IN_FRAME_HIGH_WATERMARK_TAG, Token::TokenType::END_ELEMENT );
tokens.emplace_back ( MEMORY_DATA_FRAME_TAG, Token::TokenType::END_ELEMENT );
}
@@ -107,7 +107,7 @@ void MeasurementResultsXml::composeCounterDataFrame ( deque < Token > & tokens,
tokens.emplace_back ( COUNTER_DATA_FRAME_IN_FRAME_COUNTERS_TAG, Token::TokenType::START_ELEMENT );
- for ( const auto & elem : cdf.in_frame_counters ) {
+ for ( const auto & elem : cdf.inFrameCounters ) {
tokens.emplace_back ( COUNTER_DATA_FRAME_COUNTER_TAG, Token::TokenType::START_ELEMENT );
tokens.emplace_back ( COUNTER_DATA_FRAME_COUNTER_NAME_TAG, Token::TokenType::START_ELEMENT );
tokens.emplace_back ( measurements::to_string ( elem.first ), Token::TokenType::CHARACTER );
@@ -203,7 +203,7 @@ void MeasurementResultsXml::parseMeasurementFrame ( unsigned parentIdx, Measurem
mr.frames.emplace_back ( "Root", measurements::Type::ROOT, parentIdx );
MeasurementFrame & mf = mr.frames.back ( );
- mr.frames[parentIdx].sub_idxs.push_back ( mfIdx );
+ mr.frames[parentIdx].subIdxs.push_back ( mfIdx );
for ( ; ; ) {
if ( !FromXMLParserHelper::isTokenType ( iter, Token::TokenType::START_ELEMENT ) ) break;
@@ -212,11 +212,11 @@ void MeasurementResultsXml::parseMeasurementFrame ( unsigned parentIdx, Measurem
if ( data == MEASUREMENT_FRAME_NAME_TAG ) {
FromXMLParserHelper::popToken ( iter, Token::TokenType::START_ELEMENT, MEASUREMENT_FRAME_NAME_TAG );
- mf.name = measurements::stealth_string_from_string ( FromXMLParserHelper::popTokenData ( iter, Token::TokenType::CHARACTER ) );
+ mf.name = measurements::stealthStringFromString ( FromXMLParserHelper::popTokenData ( iter, Token::TokenType::CHARACTER ) );
FromXMLParserHelper::popToken ( iter, Token::TokenType::END_ELEMENT, MEASUREMENT_FRAME_NAME_TAG );
} else if ( data == MEASUREMENT_FRAME_TYPE_TAG ) {
FromXMLParserHelper::popToken ( iter, Token::TokenType::START_ELEMENT, MEASUREMENT_FRAME_TYPE_TAG );
- mf.type = measurements::measurement_type_from_string ( FromXMLParserHelper::popTokenData ( iter, Token::TokenType::CHARACTER ) );
+ mf.type = measurements::measurementTypeFromString ( FromXMLParserHelper::popTokenData ( iter, Token::TokenType::CHARACTER ) );
FromXMLParserHelper::popToken ( iter, Token::TokenType::END_ELEMENT, MEASUREMENT_FRAME_TYPE_TAG );
} else if ( data == TIME_DATA_FRAME_TAG ) {
parseTimeDataFrame ( mf, iter );
@@ -248,7 +248,7 @@ void MeasurementResultsXml::parseTimeDataFrame ( MeasurementFrame & mf, deque <
FromXMLParserHelper::popToken ( iter, Token::TokenType::END_ELEMENT, TIME_DATA_FRAME_DURATION_TAG );
} else if ( data == TIME_DATA_FRAME_IN_FRAME_DURATION_TAG ) {
FromXMLParserHelper::popToken ( iter, Token::TokenType::START_ELEMENT, TIME_DATA_FRAME_IN_FRAME_DURATION_TAG );
- mf.time.in_frame_duration = TimeDataFrame::value_type ( valueTypeFromString < TimeDataFrame::value_type::rep > ( FromXMLParserHelper::popTokenData ( iter, Token::TokenType::CHARACTER ) ) );
+ mf.time.inFrameDuration = TimeDataFrame::value_type ( valueTypeFromString < TimeDataFrame::value_type::rep > ( FromXMLParserHelper::popTokenData ( iter, Token::TokenType::CHARACTER ) ) );
FromXMLParserHelper::popToken ( iter, Token::TokenType::END_ELEMENT, TIME_DATA_FRAME_IN_FRAME_DURATION_TAG );
} else {
break;
@@ -268,19 +268,19 @@ void MeasurementResultsXml::parseMemoryDataFrame ( MeasurementFrame & mf, deque
if ( data == MEMORY_DATA_FRAME_START_HEAP_USAGE_TAG ) {
FromXMLParserHelper::popToken ( iter, Token::TokenType::START_ELEMENT, MEMORY_DATA_FRAME_START_HEAP_USAGE_TAG );
- mf.memory.start_heap_usage = valueTypeFromString < MemoryDataFrame::value_type > ( FromXMLParserHelper::popTokenData ( iter, Token::TokenType::CHARACTER ) );
+ mf.memory.startHeapUsage = valueTypeFromString < MemoryDataFrame::value_type > ( FromXMLParserHelper::popTokenData ( iter, Token::TokenType::CHARACTER ) );
FromXMLParserHelper::popToken ( iter, Token::TokenType::END_ELEMENT, MEMORY_DATA_FRAME_START_HEAP_USAGE_TAG );
} else if ( data == MEMORY_DATA_FRAME_END_HEAP_USAGE_TAG ) {
FromXMLParserHelper::popToken ( iter, Token::TokenType::START_ELEMENT, MEMORY_DATA_FRAME_END_HEAP_USAGE_TAG );
- mf.memory.end_heap_usage = valueTypeFromString < MemoryDataFrame::value_type > ( FromXMLParserHelper::popTokenData ( iter, Token::TokenType::CHARACTER ) );
+ mf.memory.endHeapUsage = valueTypeFromString < MemoryDataFrame::value_type > ( FromXMLParserHelper::popTokenData ( iter, Token::TokenType::CHARACTER ) );
FromXMLParserHelper::popToken ( iter, Token::TokenType::END_ELEMENT, MEMORY_DATA_FRAME_END_HEAP_USAGE_TAG );
} else if ( data == MEMORY_DATA_FRAME_HIGH_WATERMARK_TAG ) {
FromXMLParserHelper::popToken ( iter, Token::TokenType::START_ELEMENT, MEMORY_DATA_FRAME_HIGH_WATERMARK_TAG );
- mf.memory.high_watermark = valueTypeFromString < MemoryDataFrame::value_type > ( FromXMLParserHelper::popTokenData ( iter, Token::TokenType::CHARACTER ) );
+ mf.memory.highWatermark = valueTypeFromString < MemoryDataFrame::value_type > ( FromXMLParserHelper::popTokenData ( iter, Token::TokenType::CHARACTER ) );
FromXMLParserHelper::popToken ( iter, Token::TokenType::END_ELEMENT, MEMORY_DATA_FRAME_HIGH_WATERMARK_TAG );
} else if ( data == MEMORY_DATA_FRAME_IN_FRAME_HIGH_WATERMARK_TAG ) {
FromXMLParserHelper::popToken ( iter, Token::TokenType::START_ELEMENT, MEMORY_DATA_FRAME_IN_FRAME_HIGH_WATERMARK_TAG );
- mf.memory.in_frame_high_watermark = valueTypeFromString < MemoryDataFrame::value_type > ( FromXMLParserHelper::popTokenData ( iter, Token::TokenType::CHARACTER ) );
+ mf.memory.inFrameHighWatermark = valueTypeFromString < MemoryDataFrame::value_type > ( FromXMLParserHelper::popTokenData ( iter, Token::TokenType::CHARACTER ) );
FromXMLParserHelper::popToken ( iter, Token::TokenType::END_ELEMENT, MEMORY_DATA_FRAME_IN_FRAME_HIGH_WATERMARK_TAG );
} else {
break;
@@ -301,7 +301,7 @@ void MeasurementResultsXml::parseCounterDataFrame ( MeasurementFrame & mf, deque
if ( data == COUNTER_DATA_FRAME_COUNTERS_TAG )
parseCounterDataFrameCounters ( COUNTER_DATA_FRAME_COUNTERS_TAG, mf.counter.counters, iter );
else if ( data == COUNTER_DATA_FRAME_IN_FRAME_COUNTERS_TAG )
- parseCounterDataFrameCounters ( COUNTER_DATA_FRAME_IN_FRAME_COUNTERS_TAG, mf.counter.in_frame_counters, iter );
+ parseCounterDataFrameCounters ( COUNTER_DATA_FRAME_IN_FRAME_COUNTERS_TAG, mf.counter.inFrameCounters, iter );
else
break;
}
@@ -330,7 +330,7 @@ void MeasurementResultsXml::parseCounterDataFrameCounters ( const std::string &
if ( counterData == COUNTER_DATA_FRAME_COUNTER_NAME_TAG ) {
FromXMLParserHelper::popToken ( iter, Token::TokenType::START_ELEMENT, COUNTER_DATA_FRAME_COUNTER_NAME_TAG );
- counterName = stealth_string_from_string ( FromXMLParserHelper::popTokenData ( iter, Token::TokenType::CHARACTER ) );
+ counterName = stealthStringFromString ( FromXMLParserHelper::popTokenData ( iter, Token::TokenType::CHARACTER ) );
FromXMLParserHelper::popToken ( iter, Token::TokenType::END_ELEMENT, COUNTER_DATA_FRAME_COUNTER_NAME_TAG );
} else if ( counterData == COUNTER_DATA_FRAME_COUNTER_VALUE_TAG ) {
FromXMLParserHelper::popToken ( iter, Token::TokenType::START_ELEMENT, COUNTER_DATA_FRAME_COUNTER_VALUE_TAG );
diff --git a/alib2common/src/measurements/MeasurementTypes.cpp b/alib2common/src/measurements/MeasurementTypes.cpp
index c352ced01e..1619dad329 100644
--- a/alib2common/src/measurements/MeasurementTypes.cpp
+++ b/alib2common/src/measurements/MeasurementTypes.cpp
@@ -2,6 +2,7 @@
* Author: Radovan Cerveny
*/
#include "MeasurementTypes.hpp"
+#include "../exception/CommonException.h"
namespace measurements {
@@ -25,18 +26,22 @@ std::string to_string ( Type t ) {
case Type::AUXILIARY:
return "AUXILIARY";
}
-
- return "ERR";
}
-Type measurement_type_from_string ( const std::string & ts ) {
+Type measurementTypeFromString ( const std::string & ts ) {
if ( ts == "ROOT" ) return Type::ROOT;
+
if ( ts == "OVERALL" ) return Type::OVERALL;
+
if ( ts == "INIT" ) return Type::INIT;
+
if ( ts == "FINALIZE" ) return Type::FINALIZE;
+
if ( ts == "MAIN" ) return Type::MAIN;
+
if ( ts == "AUXILIARY" ) return Type::AUXILIARY;
- return Type::ROOT;
+
+ throw::exception::CommonException ( "measurementTypeFromString failed, unknown measurement type: " + ts );
}
std::ostream & operator <<( std::ostream & os, Type t ) {
diff --git a/alib2common/src/measurements/MeasurementTypes.hpp b/alib2common/src/measurements/MeasurementTypes.hpp
index ba3d870aa7..ef35094832 100644
--- a/alib2common/src/measurements/MeasurementTypes.hpp
+++ b/alib2common/src/measurements/MeasurementTypes.hpp
@@ -18,9 +18,8 @@ enum class Type : unsigned {
};
std::string to_string ( Type );
-Type measurement_type_from_string ( const std::string & );
+Type measurementTypeFromString ( const std::string & );
std::ostream & operator <<( std::ostream &, Type );
-
}
#endif /* MEASUREMENT_TYPES_HPP_ */
diff --git a/alib2common/src/measurements/frames/CounterDataFrame.cpp b/alib2common/src/measurements/frames/CounterDataFrame.cpp
index 5cfc111ff7..a2c7f2dcb6 100644
--- a/alib2common/src/measurements/frames/CounterDataFrame.cpp
+++ b/alib2common/src/measurements/frames/CounterDataFrame.cpp
@@ -6,19 +6,20 @@
namespace measurements {
-void CounterDataFrame::init ( unsigned frame_idx, measurements::stealth_vector < MeasurementFrame > & frames ) {
- MeasurementFrame & current_frame = frames[frame_idx];
- MeasurementFrame & parent_frame = frames[current_frame.parent_idx];
+void CounterDataFrame::init ( unsigned frameIdx, measurements::stealth_vector < MeasurementFrame > & frames ) {
+ MeasurementFrame & currentFrame = frames[frameIdx];
+ MeasurementFrame & parentFrame = frames[currentFrame.parentIdx];
- if ( parent_frame.type != measurements::Type::ROOT )
- current_frame.counter.counters = parent_frame.counter.counters;
+ if ( parentFrame.type != measurements::Type::ROOT )
+ currentFrame.counter.counters = parentFrame.counter.counters;
}
void CounterDataFrame::update ( unsigned, measurements::stealth_vector < MeasurementFrame > & ) {
+ // noop, updates take place during hint resolution
}
-void CounterDataFrame::hint ( unsigned frame_idx, measurements::stealth_vector < MeasurementFrame > & frames, CounterHint hint ) {
- if ( frames[frame_idx].type == measurements::Type::ROOT ) return;
+void CounterDataFrame::hint ( unsigned frameIdx, measurements::stealth_vector < MeasurementFrame > & frames, CounterHint hint ) {
+ if ( frames[frameIdx].type == measurements::Type::ROOT ) return;
CounterHint::value_type delta = 0;
@@ -32,18 +33,18 @@ void CounterDataFrame::hint ( unsigned frame_idx, measurements::stealth_vector <
break;
}
- frames[frame_idx].counter.in_frame_counters[hint.name] += delta;
+ frames[frameIdx].counter.inFrameCounters[hint.name] += delta;
- unsigned cur_idx = frame_idx;
+ unsigned curIdx = frameIdx;
for ( ; ; ) {
- MeasurementFrame & current_frame = frames[cur_idx];
+ MeasurementFrame & currentFrame = frames[curIdx];
- if ( current_frame.type == measurements::Type::ROOT ) break;
+ if ( currentFrame.type == measurements::Type::ROOT ) break;
- current_frame.counter.counters[hint.name] += delta;
+ currentFrame.counter.counters[hint.name] += delta;
- cur_idx = current_frame.parent_idx;
+ curIdx = currentFrame.parentIdx;
}
}
@@ -64,8 +65,8 @@ std::ostream & operator <<( std::ostream & os, const CounterDataFrame & cdf ) {
os << "), if_cnts: (";
- for ( auto it = cdf.in_frame_counters.begin ( ); it != cdf.in_frame_counters.end ( ); ++it ) {
- if ( it != cdf.in_frame_counters.begin ( ) ) os << ", ";
+ for ( auto it = cdf.inFrameCounters.begin ( ); it != cdf.inFrameCounters.end ( ); ++it ) {
+ if ( it != cdf.inFrameCounters.begin ( ) ) os << ", ";
os << it->first << " : " << it->second;
}
diff --git a/alib2common/src/measurements/frames/CounterDataFrame.hpp b/alib2common/src/measurements/frames/CounterDataFrame.hpp
index 10896db9c9..354972b08f 100644
--- a/alib2common/src/measurements/frames/CounterDataFrame.hpp
+++ b/alib2common/src/measurements/frames/CounterDataFrame.hpp
@@ -28,7 +28,7 @@ struct CounterHint {
struct CounterDataFrame {
measurements::stealth_map < measurements::stealth_string, CounterHint::value_type > counters;
- measurements::stealth_map < measurements::stealth_string, CounterHint::value_type > in_frame_counters;
+ measurements::stealth_map < measurements::stealth_string, CounterHint::value_type > inFrameCounters;
static void init ( unsigned, measurements::stealth_vector < MeasurementFrame > & );
static void update ( unsigned, measurements::stealth_vector < MeasurementFrame > & );
diff --git a/alib2common/src/measurements/frames/MemoryDataFrame.cpp b/alib2common/src/measurements/frames/MemoryDataFrame.cpp
index f93ecb8f2f..144624aafb 100644
--- a/alib2common/src/measurements/frames/MemoryDataFrame.cpp
+++ b/alib2common/src/measurements/frames/MemoryDataFrame.cpp
@@ -6,60 +6,60 @@
namespace measurements {
-void MemoryDataFrame::init ( unsigned frame_idx, measurements::stealth_vector < MeasurementFrame > & frames ) {
- MeasurementFrame & current_frame = frames[frame_idx];
- MeasurementFrame & parent_frame = frames[current_frame.parent_idx];
+void MemoryDataFrame::init ( unsigned frameIdx, measurements::stealth_vector < MeasurementFrame > & frames ) {
+ MeasurementFrame & currentFrame = frames[frameIdx];
+ MeasurementFrame & parentFrame = frames[currentFrame.parentIdx];
// "hacky" adjustment, if this is the first user inserted frame, we reset ROOTs values to 0
// beacause we want the heap usage to start at 0 and also we want to be able to propagate ROOTs values between separate
// user OVERALL frames
- if ( ( parent_frame.type == measurements::Type::ROOT ) && ( frames.size ( ) == 2 ) ) {
- parent_frame.memory.start_heap_usage = 0;
- parent_frame.memory.current_heap_usage = 0;
- parent_frame.memory.high_watermark = 0;
- parent_frame.memory.in_frame_high_watermark = 0;
+ if ( ( parentFrame.type == measurements::Type::ROOT ) && ( frames.size ( ) == 2 ) ) {
+ parentFrame.memory.startHeapUsage = 0;
+ parentFrame.memory.currentHeapUsage = 0;
+ parentFrame.memory.highWatermark = 0;
+ parentFrame.memory.inFrameHighWatermark = 0;
}
- current_frame.memory.start_heap_usage = parent_frame.memory.current_heap_usage;
- current_frame.memory.current_heap_usage = parent_frame.memory.current_heap_usage;
- current_frame.memory.high_watermark = parent_frame.memory.current_heap_usage;
- current_frame.memory.in_frame_high_watermark = parent_frame.memory.current_heap_usage;
+ currentFrame.memory.startHeapUsage = parentFrame.memory.currentHeapUsage;
+ currentFrame.memory.currentHeapUsage = parentFrame.memory.currentHeapUsage;
+ currentFrame.memory.highWatermark = parentFrame.memory.currentHeapUsage;
+ currentFrame.memory.inFrameHighWatermark = parentFrame.memory.currentHeapUsage;
}
-void MemoryDataFrame::update ( unsigned frame_idx, measurements::stealth_vector < MeasurementFrame > & frames ) {
- MeasurementFrame & current_frame = frames[frame_idx];
- MeasurementFrame & parent_frame = frames[current_frame.parent_idx];
+void MemoryDataFrame::update ( unsigned frameIdx, measurements::stealth_vector < MeasurementFrame > & frames ) {
+ MeasurementFrame & currentFrame = frames[frameIdx];
+ MeasurementFrame & parentFrame = frames[currentFrame.parentIdx];
- current_frame.memory.end_heap_usage = current_frame.memory.current_heap_usage;
+ currentFrame.memory.endHeapUsage = currentFrame.memory.currentHeapUsage;
// if we end up with more memory from children, adjust watermark
- if ( current_frame.memory.current_heap_usage > current_frame.memory.in_frame_high_watermark )
- current_frame.memory.in_frame_high_watermark = current_frame.memory.current_heap_usage;
+ if ( currentFrame.memory.currentHeapUsage > currentFrame.memory.inFrameHighWatermark )
+ currentFrame.memory.inFrameHighWatermark = currentFrame.memory.currentHeapUsage;
- if ( parent_frame.memory.high_watermark < current_frame.memory.in_frame_high_watermark )
- parent_frame.memory.high_watermark = current_frame.memory.in_frame_high_watermark;
+ if ( parentFrame.memory.highWatermark < currentFrame.memory.inFrameHighWatermark )
+ parentFrame.memory.highWatermark = currentFrame.memory.inFrameHighWatermark;
- if ( current_frame.memory.high_watermark < current_frame.memory.in_frame_high_watermark )
- current_frame.memory.high_watermark = current_frame.memory.in_frame_high_watermark;
+ if ( currentFrame.memory.highWatermark < currentFrame.memory.inFrameHighWatermark )
+ currentFrame.memory.highWatermark = currentFrame.memory.inFrameHighWatermark;
- parent_frame.memory.current_heap_usage = current_frame.memory.current_heap_usage;
+ parentFrame.memory.currentHeapUsage = currentFrame.memory.currentHeapUsage;
}
-void MemoryDataFrame::hint ( unsigned frame_idx, measurements::stealth_vector < MeasurementFrame > & frames, MemoryHint hint ) {
+void MemoryDataFrame::hint ( unsigned frameIdx, measurements::stealth_vector < MeasurementFrame > & frames, MemoryHint hint ) {
- MeasurementFrame & current_frame = frames[frame_idx];
+ MeasurementFrame & currentFrame = frames[frameIdx];
switch ( hint.type ) {
case MemoryHint::Type::NEW:
- current_frame.memory.current_heap_usage += hint.size;
+ currentFrame.memory.currentHeapUsage += hint.size;
- if ( current_frame.memory.current_heap_usage > current_frame.memory.in_frame_high_watermark )
- current_frame.memory.in_frame_high_watermark = current_frame.memory.current_heap_usage;
+ if ( currentFrame.memory.currentHeapUsage > currentFrame.memory.inFrameHighWatermark )
+ currentFrame.memory.inFrameHighWatermark = currentFrame.memory.currentHeapUsage;
break;
case MemoryHint::Type::DELETE:
- current_frame.memory.current_heap_usage -= hint.size;
+ currentFrame.memory.currentHeapUsage -= hint.size;
break;
}
}
@@ -70,7 +70,7 @@ MemoryDataFrame MemoryDataFrame::aggregate ( const std::vector < MeasurementFram
}
std::ostream & operator <<( std::ostream & os, const MemoryDataFrame & mdf ) {
- os << mdf.start_heap_usage << "B shu, " << mdf.end_heap_usage << "B ehu, " << mdf.high_watermark << "B hw, " << mdf.in_frame_high_watermark << "B if_hw";
+ os << mdf.startHeapUsage << "B shu, " << mdf.endHeapUsage << "B ehu, " << mdf.highWatermark << "B hw, " << mdf.inFrameHighWatermark << "B if_hw";
return os;
}
diff --git a/alib2common/src/measurements/frames/MemoryDataFrame.hpp b/alib2common/src/measurements/frames/MemoryDataFrame.hpp
index f0a4672491..c8b69ac343 100644
--- a/alib2common/src/measurements/frames/MemoryDataFrame.hpp
+++ b/alib2common/src/measurements/frames/MemoryDataFrame.hpp
@@ -28,13 +28,13 @@ struct MemoryHint {
struct MemoryDataFrame {
using value_type = ssize_t;
- value_type start_heap_usage;
- value_type end_heap_usage;
+ value_type startHeapUsage;
+ value_type endHeapUsage;
- value_type high_watermark;
- value_type in_frame_high_watermark;
+ value_type highWatermark;
+ value_type inFrameHighWatermark;
- value_type current_heap_usage;
+ value_type currentHeapUsage;
static void init ( unsigned, measurements::stealth_vector < MeasurementFrame > & );
static void update ( unsigned, measurements::stealth_vector < MeasurementFrame > & );
diff --git a/alib2common/src/measurements/frames/TimeDataFrame.cpp b/alib2common/src/measurements/frames/TimeDataFrame.cpp
index 43f5f1c8bb..7c9834e43e 100644
--- a/alib2common/src/measurements/frames/TimeDataFrame.cpp
+++ b/alib2common/src/measurements/frames/TimeDataFrame.cpp
@@ -10,39 +10,40 @@ using namespace std::chrono;
namespace measurements {
-void TimeDataFrame::init ( unsigned frame_idx, measurements::stealth_vector < MeasurementFrame > & frames ) {
- MeasurementFrame & current_frame = frames[frame_idx];
+void TimeDataFrame::init ( unsigned frameIdx, measurements::stealth_vector < MeasurementFrame > & frames ) {
+ MeasurementFrame & currentFrame = frames[frameIdx];
- current_frame.time.start = high_resolution_clock::now ( );
+ currentFrame.time.start = high_resolution_clock::now ( );
}
-void TimeDataFrame::update ( unsigned frame_idx, measurements::stealth_vector < MeasurementFrame > & frames ) {
- MeasurementFrame & current_frame = frames[frame_idx];
+void TimeDataFrame::update ( unsigned frameIdx, measurements::stealth_vector < MeasurementFrame > & frames ) {
+ MeasurementFrame & currentFrame = frames[frameIdx];
- current_frame.time.duration = duration_cast < microseconds > ( high_resolution_clock::now ( ) - current_frame.time.start );
- current_frame.time.in_frame_duration += current_frame.time.duration;
+ currentFrame.time.duration = duration_cast < microseconds > ( high_resolution_clock::now ( ) - currentFrame.time.start );
+ currentFrame.time.inFrameDuration += currentFrame.time.duration;
- MeasurementFrame & parent_frame = frames[current_frame.parent_idx];
+ MeasurementFrame & parentFrame = frames[currentFrame.parentIdx];
- parent_frame.time.in_frame_duration -= current_frame.time.duration;
+ parentFrame.time.inFrameDuration -= currentFrame.time.duration;
}
TimeDataFrame TimeDataFrame::aggregate ( const std::vector < MeasurementFrame > & framesToAggregate ) {
TimeDataFrame aggregatedTimeDataFrame { };
+ // we want to compute simple average of times
for ( const MeasurementFrame & frame : framesToAggregate ) {
aggregatedTimeDataFrame.duration += frame.time.duration;
- aggregatedTimeDataFrame.in_frame_duration += frame.time.in_frame_duration;
+ aggregatedTimeDataFrame.inFrameDuration += frame.time.inFrameDuration;
}
aggregatedTimeDataFrame.duration /= framesToAggregate.size ( );
- aggregatedTimeDataFrame.in_frame_duration /= framesToAggregate.size ( );
+ aggregatedTimeDataFrame.inFrameDuration /= framesToAggregate.size ( );
return aggregatedTimeDataFrame;
}
std::ostream & operator <<( std::ostream & os, const TimeDataFrame & tdf ) {
- os << tdf.duration << " dur, " << tdf.in_frame_duration << " if_dur";
+ os << tdf.duration << " dur, " << tdf.inFrameDuration << " if_dur";
return os;
}
diff --git a/alib2common/src/measurements/frames/TimeDataFrame.hpp b/alib2common/src/measurements/frames/TimeDataFrame.hpp
index 99e7f5a09b..4690cf9942 100644
--- a/alib2common/src/measurements/frames/TimeDataFrame.hpp
+++ b/alib2common/src/measurements/frames/TimeDataFrame.hpp
@@ -20,7 +20,7 @@ struct TimeDataFrame {
std::chrono::time_point < std::chrono::high_resolution_clock > start;
value_type duration;
- value_type in_frame_duration;
+ value_type inFrameDuration;
static void init ( unsigned, measurements::stealth_vector < MeasurementFrame > & );
static void update ( unsigned, measurements::stealth_vector < MeasurementFrame > & );
diff --git a/alib2common/src/measurements/measurements.cpp b/alib2common/src/measurements/measurements.cpp
index 98450ac84f..3d34051ea7 100644
--- a/alib2common/src/measurements/measurements.cpp
+++ b/alib2common/src/measurements/measurements.cpp
@@ -8,22 +8,22 @@ namespace measurements {
void start ( measurements::stealth_string name, measurements::Type type ) {
if ( MeasurementEngine::OPERATIONAL )
- MeasurementEngine::INSTANCE.push_measurement_frame ( std::move ( name ), type );
+ MeasurementEngine::INSTANCE.pushMeasurementFrame ( std::move ( name ), type );
}
void end ( ) {
if ( MeasurementEngine::OPERATIONAL )
- MeasurementEngine::INSTANCE.pop_measurement_frame ( );
+ MeasurementEngine::INSTANCE.popMeasurementFrame ( );
}
void reset ( ) {
if ( MeasurementEngine::OPERATIONAL )
- MeasurementEngine::INSTANCE.reset_measurements ( );
+ MeasurementEngine::INSTANCE.resetMeasurements ( );
}
MeasurementResults results ( ) {
if ( MeasurementEngine::OPERATIONAL )
- return MeasurementEngine::INSTANCE.get_results ( );
+ return MeasurementEngine::INSTANCE.getResults ( );
else
return MeasurementResults ( );
}
diff --git a/alib2measurepp/src/processor/MeasurementProcessor.cpp b/alib2measurepp/src/processor/MeasurementProcessor.cpp
index 39a8320899..855872caf5 100644
--- a/alib2measurepp/src/processor/MeasurementProcessor.cpp
+++ b/alib2measurepp/src/processor/MeasurementProcessor.cpp
@@ -50,9 +50,9 @@ MeasurementResults MeasurementProcessor::processMeasurementResults ( const Measu
dfsLambda = [&] ( unsigned idx, unsigned newmrParentIdx ) {
if ( idx == 0 ) {
newmr.frames.push_back ( mr.frames[0] );
- newmr.frames[0].sub_idxs.clear ( );
+ newmr.frames[0].subIdxs.clear ( );
- for ( unsigned subIdx : mr.frames[idx].sub_idxs )
+ for ( unsigned subIdx : mr.frames[idx].subIdxs )
dfsLambda ( subIdx, 0 );
} else {
const MeasurementFrame & curFrame = mr.frames[idx];
@@ -64,13 +64,13 @@ MeasurementResults MeasurementProcessor::processMeasurementResults ( const Measu
if ( !filteredOut ) {
unsigned newmrIdx = newmr.frames.size ( );
newmr.frames.push_back ( mr.frames[idx] );
- newmr.frames[newmrIdx].sub_idxs.clear ( );
- newmr.frames[newmrParentIdx].sub_idxs.push_back ( newmrIdx );
+ newmr.frames[newmrIdx].subIdxs.clear ( );
+ newmr.frames[newmrParentIdx].subIdxs.push_back ( newmrIdx );
- for ( unsigned subIdx : mr.frames[idx].sub_idxs )
+ for ( unsigned subIdx : mr.frames[idx].subIdxs )
dfsLambda ( subIdx, newmrIdx );
} else {
- for ( unsigned subIdx : mr.frames[idx].sub_idxs )
+ for ( unsigned subIdx : mr.frames[idx].subIdxs )
dfsLambda ( subIdx, newmrParentIdx );
}
}
diff --git a/alib2measurepp/src/processor/MeasurementProcessorOutput.cpp b/alib2measurepp/src/processor/MeasurementProcessorOutput.cpp
index de4b1c84e9..d882df5037 100644
--- a/alib2measurepp/src/processor/MeasurementProcessorOutput.cpp
+++ b/alib2measurepp/src/processor/MeasurementProcessorOutput.cpp
@@ -122,22 +122,18 @@ void MeasurementProcessorOutput::outputHtml ( std::ostream &, const MeasurementP
}
std::string MeasurementProcessorOutput::getData ( const MeasurementFrame & frame, const MeasurementProcessorOutput & mpo ) {
+ // FIXME take in account engineAttr in mpo
switch ( mpo.outputEngine ) {
case OutputEngine::TIME:
return std::to_string ( frame.time.duration.count ( ) );
- break;
-
case OutputEngine::MEMORY:
- return std::to_string ( frame.memory.high_watermark - frame.memory.start_heap_usage );
-
- break;
+ return std::to_string ( frame.memory.highWatermark - frame.memory.startHeapUsage );
case OutputEngine::COUNTER:
+ // FIXME
return "";
-
- break;
}
return "";
diff --git a/alib2measurepp/src/provisioner/MeasurementProvisioner.cpp b/alib2measurepp/src/provisioner/MeasurementProvisioner.cpp
index fa7c73a37e..719bcf4a7b 100644
--- a/alib2measurepp/src/provisioner/MeasurementProvisioner.cpp
+++ b/alib2measurepp/src/provisioner/MeasurementProvisioner.cpp
@@ -18,7 +18,7 @@ MeasurementProvisionerResults MeasurementProvisioner::runConfiguration ( const M
prepareEnvironment ( cfg );
- clog << "Preparing data ...";
+ clog << "Preparing data ..." << flush;
MPInputData mpiData ( cfg );
--
GitLab