MeasurementResults can now be parsed from xml

alib2measure/src/allocator/StealthTypes.cpp

@@ -13,4 +13,8 @@ std::string to_string ( stealth_string & ss ) {
 	return ss.c_str ( );
 }
+stealth_string stealth_string_from_string ( const std::string & str ) {
+	return stealth_string ( str.c_str ( ) );
+}
+
 }

alib2measure/src/allocator/StealthTypes.hpp

@@ -17,12 +17,13 @@ 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 & );
+
 template < typename T >
 using stealth_vector = std::vector < T, stealth_allocator < T > >;
 template < class Key, class T, class Compare = std::less < Key > >
 using stealth_map = std::map < Key, T, Compare, stealth_allocator < std::pair < const Key, T > > >;
-
 }
 #endif /* STEALTH_TYPES_HPP_ */

alib2measure/src/measurements/MeasurementTypes.cpp

@@ -29,6 +29,16 @@ std::string to_string ( Type t ) {
 	return "ERR";
 }
+Type measurement_type_from_string ( 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;
+}
+
 std::ostream & operator <<( std::ostream & os, Type t ) {
 	os << to_string ( t );
 	return os;

alib2measure/src/measurements/MeasurementTypes.hpp

@@ -18,6 +18,7 @@ enum class Type : unsigned {
 };
 std::string to_string ( Type );
+Type measurement_type_from_string ( const std::string & );
 std::ostream & operator <<( std::ostream &, Type );
 }

alib2measure/src/measurements/MeasurementXmlFactory.hpp

@@ -40,10 +40,21 @@ class MeasurementXmlFactory {
 	static std::string COUNTER_DATA_FRAME_COUNTER_NAME_TAG;
 	static std::string COUNTER_DATA_FRAME_COUNTER_VALUE_TAG;
-	static void composeMeasurementFrames ( std::deque < sax::Token > &, unsigned, const measurements::stealth_vector < MeasurementFrame > & );
-	static void composeTimeDataFrame ( std::deque < sax::Token > &, unsigned, const measurements::stealth_vector < MeasurementFrame > & );
-	static void composeMemoryDataFrame ( std::deque < sax::Token > &, unsigned, const measurements::stealth_vector < MeasurementFrame > & );
-	static void composeCounterDataFrame ( std::deque < sax::Token > &, unsigned, const measurements::stealth_vector < MeasurementFrame > & );
+	static void composeMeasurementFrames ( std::deque < sax::Token > &, unsigned, const stealth_vector < MeasurementFrame > & );
+	static void composeTimeDataFrame ( std::deque < sax::Token > &, unsigned, const stealth_vector < MeasurementFrame > & );
+	static void composeMemoryDataFrame ( std::deque < sax::Token > &, unsigned, const stealth_vector < MeasurementFrame > & );
+	static void composeCounterDataFrame ( std::deque < sax::Token > &, unsigned, const stealth_vector < MeasurementFrame > & );
+
+	static void parseRootMeasurementFrame ( MeasurementResults &, std::deque < sax::Token >::iterator & );
+	static void parseSubframes ( unsigned, MeasurementResults &, std::deque < sax::Token >::iterator & );
+	static void parseMeasurementFrame ( unsigned, MeasurementResults &, std::deque < sax::Token >::iterator & );
+	static void parseTimeDataFrame ( MeasurementFrame &, std::deque < sax::Token >::iterator & );
+	static void parseMemoryDataFrame ( MeasurementFrame &, std::deque < sax::Token >::iterator & );
+	static void parseCounterDataFrame ( MeasurementFrame &, std::deque < sax::Token >::iterator & );
+	static void parseCounterDataFrameCounters ( const std::string &, stealth_map < stealth_string, CounterHint::value_type > &, std::deque < sax::Token >::iterator & );
+
+	template < typename T >
+	static T valueTypeFromString ( const std::string & );
 public:
 	static std::deque < sax::Token > composeMeasurementResults ( const MeasurementResults & );

alib2measure/src/measurements/frames/MemoryDataFrame.hpp

@@ -16,20 +16,23 @@ struct MemoryDataFrame;
 struct MemoryHint {
 	using frame_type = MemoryDataFrame;
+	using value_type = size_t;
 	enum class Type {
 		NEW, DELETE
 	};
 	Type   type;
-	size_t size;
+	value_type size;
 };
 struct MemoryDataFrame {
-	size_t start_heap_usage;
-	size_t end_heap_usage;
-	size_t high_watermark;
-	size_t current_heap_usage;
+	using value_type = size_t;
+	value_type start_heap_usage;
+	value_type end_heap_usage;
+	value_type high_watermark;
+
+	value_type current_heap_usage;
 	static void init ( unsigned, measurements::stealth_vector < MeasurementFrame > & );
 	static void update ( unsigned, measurements::stealth_vector < MeasurementFrame > & );

alib2measure/src/measurements/frames/TimeDataFrame.hpp

@@ -15,10 +15,12 @@ namespace measurements {
 struct MeasurementFrame;
 struct TimeDataFrame {
+	using value_type = std::chrono::microseconds;
+
 	std::chrono::time_point < std::chrono::high_resolution_clock > start;
-	std::chrono::microseconds duration;
-	std::chrono::microseconds real_duration;
+	value_type duration;
+	value_type real_duration;
 	static void init ( unsigned, measurements::stealth_vector < MeasurementFrame > & );
 	static void update ( unsigned, measurements::stealth_vector < MeasurementFrame > & );

alib2measure/src/measurements/measurements.hpp

@@ -6,6 +6,7 @@
 #define MEASUREMENTS_HPP_
 #include "MeasurementEngine.hpp"
+#include "MeasurementXmlFactory.hpp"
 namespace measurements {

alib2measure/test-src/measurements/MeasurementsTest.cpp

 #include "MeasurementsTest.h"
 #include "sax/SaxComposeInterface.h"
+#include <sstream>
 #include <thread>
 #include <cmath>
 #include <measure>
@@ -15,7 +16,6 @@ void MeasurementsTest::tearDown ( ) {
 }
 void MeasurementsTest::testConstructMeasurements ( ) {
-
 }
 void MeasurementsTest::testTimeMeasurements ( ) {
@@ -72,11 +72,12 @@ void MeasurementsTest::testMemoryMeasurements ( ) {
 	measurements::start ( "chunk1", measurements::Type::MAIN );
 	int * baz = new int[500];
-	delete[] baz;
 	measurements::end ( );
-	measurements::start ( "chunk2", measurements::Type::MAIN );
+	delete[] baz;
+
 	int * foo = new int[1000];
+	measurements::start ( "chunk2", measurements::Type::MAIN );
 	measurements::start ( "chunk21", measurements::Type::MAIN );
 	int * bar = new int[2000];
 	measurements::end ( );
@@ -92,21 +93,21 @@ void MeasurementsTest::testMemoryMeasurements ( ) {
 void MeasurementsTest::testCounterMeasurements ( ) {
 	measurements::start ( "chunk1", measurements::Type::MAIN );
-	measurements::hint( measurements::CounterHint { "test1", measurements::CounterHint::Type::ADD, 5 } );
-	measurements::hint( measurements::CounterHint { "test2", measurements::CounterHint::Type::INC, 0 } );
+	measurements::hint ( measurements::CounterHint { "test1", measurements::CounterHint::Type::ADD, 5 } );
+	measurements::hint ( measurements::CounterHint { "test2", measurements::CounterHint::Type::INC, 0 } );
 	measurements::start ( "chunk11", measurements::Type::MAIN );
-	measurements::hint( measurements::CounterHint { "test3", measurements::CounterHint::Type::DEC, 0} );
+	measurements::hint ( measurements::CounterHint { "test3", measurements::CounterHint::Type::DEC, 0 } );
 	measurements::start ( "chunk111", measurements::Type::MAIN );
-	measurements::hint( measurements::CounterHint { "test1", measurements::CounterHint::Type::DEC, 0 } );
-	measurements::hint( measurements::CounterHint { "test2", measurements::CounterHint::Type::SUB, 10 } );
-	measurements::hint( measurements::CounterHint { "test3", measurements::CounterHint::Type::DEC, 0} );
-	measurements::hint( measurements::CounterHint { "test4", measurements::CounterHint::Type::DEC, 0} );
+	measurements::hint ( measurements::CounterHint { "test1", measurements::CounterHint::Type::DEC, 0 } );
+	measurements::hint ( measurements::CounterHint { "test2", measurements::CounterHint::Type::SUB, 10 } );
+	measurements::hint ( measurements::CounterHint { "test3", measurements::CounterHint::Type::DEC, 0 } );
+	measurements::hint ( measurements::CounterHint { "test4", measurements::CounterHint::Type::DEC, 0 } );
 	measurements::end ( );
 	measurements::start ( "chunk112", measurements::Type::MAIN );
-	measurements::hint( measurements::CounterHint { "test1", measurements::CounterHint::Type::DEC, 0 } );
-	measurements::hint( measurements::CounterHint { "test2", measurements::CounterHint::Type::SUB, 10 } );
-	measurements::hint( measurements::CounterHint { "test3", measurements::CounterHint::Type::DEC, 0} );
-	measurements::hint( measurements::CounterHint { "test4", measurements::CounterHint::Type::DEC, 0} );
+	measurements::hint ( measurements::CounterHint { "test1", measurements::CounterHint::Type::DEC, 0 } );
+	measurements::hint ( measurements::CounterHint { "test2", measurements::CounterHint::Type::SUB, 10 } );
+	measurements::hint ( measurements::CounterHint { "test3", measurements::CounterHint::Type::DEC, 0 } );
+	measurements::hint ( measurements::CounterHint { "test4", measurements::CounterHint::Type::DEC, 0 } );
 	measurements::end ( );
 	measurements::end ( );
 	measurements::end ( );
@@ -114,4 +115,84 @@ void MeasurementsTest::testCounterMeasurements ( ) {
 	std::cout << measurements::MeasurementFormat::LIST << measurements::results ( ) << std::endl;
 	std::cout << measurements::MeasurementFormat::TREE << measurements::results ( ) << std::endl;
 	std::cout << measurements::MeasurementFormat::XML << measurements::results ( ) << std::endl;
-}
+}
\ No newline at end of file
+
+void MeasurementsTest::testMeasurementXmlFactory ( ) {
+	measurements::start ( "global", measurements::Type::OVERALL );
+	measurements::start ( "init", measurements::Type::INIT );
+	std::this_thread::sleep_for ( std::chrono::milliseconds ( 100 ) );
+	measurements::end ( );
+	measurements::hint ( measurements::CounterHint { "counter2", measurements::CounterHint::Type::SUB, 5 } );
+
+	measurements::start ( "main", measurements::Type::MAIN );
+	int * foo = new int[1000];
+
+	std::this_thread::sleep_for ( std::chrono::milliseconds ( 20 ) );
+	measurements::start ( "aux", measurements::Type::AUXILIARY );
+	std::this_thread::sleep_for ( std::chrono::milliseconds ( 40 ) );
+	measurements::hint ( measurements::CounterHint { "counter2", measurements::CounterHint::Type::SUB, 5 } );
+
+	measurements::end ( );
+	std::this_thread::sleep_for ( std::chrono::milliseconds ( 80 ) );
+	measurements::start ( "aux", measurements::Type::AUXILIARY );
+	std::this_thread::sleep_for ( std::chrono::milliseconds ( 40 ) );
+	measurements::end ( );
+	std::this_thread::sleep_for ( std::chrono::milliseconds ( 80 ) );
+	measurements::end ( );
+	measurements::hint ( measurements::CounterHint { "counter2", measurements::CounterHint::Type::SUB, 5 } );
+
+	measurements::start ( "fin", measurements::Type::FINALIZE );
+	std::this_thread::sleep_for ( std::chrono::milliseconds ( 30 ) );
+	measurements::start ( "aux", measurements::Type::AUXILIARY );
+	int * bar = new int[2000];
+
+	std::this_thread::sleep_for ( std::chrono::milliseconds ( 40 ) );
+	measurements::end ( );
+	std::this_thread::sleep_for ( std::chrono::milliseconds ( 80 ) );
+	measurements::end ( );
+	measurements::hint ( measurements::CounterHint { "counter1", measurements::CounterHint::Type::ADD, 1 } );
+
+	measurements::end ( );
+	measurements::start ( "global2", measurements::Type::OVERALL );
+	std::this_thread::sleep_for ( std::chrono::milliseconds ( 100 ) );
+	measurements::end ( );
+
+	delete[] foo;
+	measurements::start ( "global3", measurements::Type::OVERALL );
+	measurements::start ( "init", measurements::Type::INIT );
+	std::this_thread::sleep_for ( std::chrono::milliseconds ( 100 ) );
+	measurements::end ( );
+	measurements::start ( "main", measurements::Type::MAIN );
+	delete[] bar;
+	std::this_thread::sleep_for ( std::chrono::milliseconds ( 20 ) );
+	measurements::start ( "aux", measurements::Type::AUXILIARY );
+	measurements::hint ( measurements::CounterHint { "counter1", measurements::CounterHint::Type::ADD, 1 } );
+
+	std::this_thread::sleep_for ( std::chrono::milliseconds ( 40 ) );
+	measurements::end ( );
+	std::this_thread::sleep_for ( std::chrono::milliseconds ( 80 ) );
+	measurements::start ( "aux", measurements::Type::AUXILIARY );
+	measurements::hint ( measurements::CounterHint { "counter1", measurements::CounterHint::Type::ADD, 1 } );
+
+	std::this_thread::sleep_for ( std::chrono::milliseconds ( 40 ) );
+	measurements::end ( );
+	std::this_thread::sleep_for ( std::chrono::milliseconds ( 80 ) );
+	measurements::end ( );
+	measurements::end ( );
+
+	std::deque < sax::Token > tokens = measurements::MeasurementXmlFactory::composeMeasurementResults ( measurements::results ( ) );
+
+	measurements::MeasurementResults convertedResults = measurements::MeasurementXmlFactory::parseMeasurementResults ( tokens );
+
+	std::ostringstream ossoriginal;
+
+	ossoriginal << measurements::MeasurementFormat::LIST << measurements::results ( ) << std::endl;
+
+	std::ostringstream ossconverted;
+
+	ossconverted << measurements::MeasurementFormat::LIST << convertedResults << std::endl;
+
+	std::cout << ossoriginal.str ( ) << std::endl << ossconverted.str ( ) << std::endl;
+
+	CPPUNIT_ASSERT ( ossoriginal.str ( ) == ossconverted.str ( ) );
+}

alib2measure/test-src/measurements/MeasurementsTest.h

@@ -9,6 +9,7 @@ class MeasurementsTest : public CppUnit::TestFixture {
   CPPUNIT_TEST ( testTimeMeasurements );
   CPPUNIT_TEST ( testMemoryMeasurements );
   CPPUNIT_TEST ( testCounterMeasurements );
+  CPPUNIT_TEST ( testMeasurementXmlFactory );
   CPPUNIT_TEST_SUITE_END ( );
 public:
@@ -19,6 +20,8 @@ public:
   void testTimeMeasurements ( );
   void testMemoryMeasurements ( );
   void testCounterMeasurements ( );
+
+  void testMeasurementXmlFactory ( );
 };
 #endif // MEASUREMENTS_TEST_H_