diff --git a/alib2algo/src/measurements/MeasurementEngine.cpp b/alib2algo/src/measurements/MeasurementEngine.cpp index 8b837ab78c7cd3926b0674efaffa275154783a40..9b9dd2f53a3c3c0d8f77c9d75edf830393a39b7c 100644 --- a/alib2algo/src/measurements/MeasurementEngine.cpp +++ b/alib2algo/src/measurements/MeasurementEngine.cpp @@ -37,6 +37,10 @@ void MeasurementEngine::pop_measurement_frame ( ) { MemoryDataFrame::update ( current_idx, frames ); } +void MeasurementEngine::memory_hint ( MemoryHint mh ) { + MemoryDataFrame::hint ( frame_idx_stack.back ( ), frames, std::move ( mh ) ); +} + void MeasurementEngine::print_as_list ( std::ostream & os, unsigned idx ) { MeasurementFrame & frame = frames[idx]; diff --git a/alib2algo/src/measurements/MeasurementEngine.hpp b/alib2algo/src/measurements/MeasurementEngine.hpp index 3ba730e679d330a71ce9580c2b4af0d1dcf5a57d..69590f048fc8ee25bc2c9cbee339672e809cba59 100644 --- a/alib2algo/src/measurements/MeasurementEngine.hpp +++ b/alib2algo/src/measurements/MeasurementEngine.hpp @@ -7,7 +7,7 @@ #include <ostream> #include "MeasurementTypes.hpp" -#include "MeasurementFrame.hpp" +#include "MeasurementFrames.hpp" namespace measurements { @@ -23,6 +23,8 @@ public: void push_measurement_frame ( std::string, measurements::Type ); void pop_measurement_frame ( ); + void memory_hint ( MemoryHint ); + void print_as_list ( std::ostream & ); void print_as_tree ( std::ostream & ); diff --git a/alib2algo/src/measurements/MeasurementFrame.hpp b/alib2algo/src/measurements/MeasurementFrames.hpp similarity index 86% rename from alib2algo/src/measurements/MeasurementFrame.hpp rename to alib2algo/src/measurements/MeasurementFrames.hpp index 20b9e2c21f1941adaa3a3d81d03f2c047aab64dd..d66eac39d11bf11fbceeab4190278c3c8ac4f278 100644 --- a/alib2algo/src/measurements/MeasurementFrame.hpp +++ b/alib2algo/src/measurements/MeasurementFrames.hpp @@ -6,28 +6,39 @@ #define MEASUREMENT_FRAME_HPP_ #include <chrono> +#include <sstream> #include "MeasurementTypes.hpp" namespace measurements { struct MeasurementFrame; -struct TimeDataFrame { - std::chrono::time_point < std::chrono::high_resolution_clock > start; +struct MemoryHint { + enum class Type { + NEW, DELETE + }; - std::chrono::microseconds duration; - std::chrono::microseconds real_duration; + Type type; + size_t size; +}; + +struct MemoryDataFrame { + unsigned current_heap_usage; + unsigned high_watermark; std::string to_string ( ); // void to_xml ( ); static void init ( unsigned, std::vector < MeasurementFrame > & ); static void update ( unsigned, std::vector < MeasurementFrame > & ); + static void hint ( unsigned, std::vector < MeasurementFrame > &, MemoryHint ); }; -struct MemoryDataFrame { - unsigned current_heap_usage; - unsigned high_watermark; +struct TimeDataFrame { + std::chrono::time_point < std::chrono::high_resolution_clock > start; + + std::chrono::microseconds duration; + std::chrono::microseconds real_duration; std::string to_string ( ); // void to_xml ( ); diff --git a/alib2algo/src/measurements/MemoryDataFrame.cpp b/alib2algo/src/measurements/MemoryDataFrame.cpp index 3c5ba5d8cc59673a4f2f8de67b9ccc7cfdf5387e..cded19e2291e3a7af680315ce5a9961effbfa494 100644 --- a/alib2algo/src/measurements/MemoryDataFrame.cpp +++ b/alib2algo/src/measurements/MemoryDataFrame.cpp @@ -2,8 +2,7 @@ * Author: Radovan Cerveny */ -#include <sstream> -#include "MeasurementFrame.hpp" +#include "MeasurementFrames.hpp" using namespace std::chrono; @@ -19,6 +18,11 @@ void MemoryDataFrame::update ( unsigned frame_idx, std::vector < MeasurementFram MeasurementFrame & parent_frame = frames[current_frame.parent_idx]; } +void MemoryDataFrame::hint ( unsigned frame_idx, std::vector < MeasurementFrame > & frames, MemoryHint hint ) { + MeasurementFrame & current_frame = frames[frame_idx]; + frame_idx = hint.size = 0; +} + std::string MemoryDataFrame::to_string ( ) { std::stringstream ss; diff --git a/alib2algo/src/measurements/TimeDataFrame.cpp b/alib2algo/src/measurements/TimeDataFrame.cpp index a7e1c438dfff81804745f7c655c2683ae64e8d07..209c6b665eb32098dff1328237f3852e9352bc2a 100644 --- a/alib2algo/src/measurements/TimeDataFrame.cpp +++ b/alib2algo/src/measurements/TimeDataFrame.cpp @@ -3,7 +3,7 @@ */ #include <sstream> -#include "MeasurementFrame.hpp" +#include "MeasurementFrames.hpp" using namespace std::chrono; diff --git a/alib2algo/src/measurements/measurements.hpp b/alib2algo/src/measurements/measurements.hpp index f21cdef6cbad7809e50e5c71c1abef6250a49d47..ccd80db859c55b31a237ae421e1931748625bca3 100644 --- a/alib2algo/src/measurements/measurements.hpp +++ b/alib2algo/src/measurements/measurements.hpp @@ -17,6 +17,10 @@ void end ( ) { MeasurementEngine::INSTANCE.pop_measurement_frame ( ); } +void memory_hint ( MemoryHint mh ) { + MeasurementEngine::INSTANCE.memory_hint ( std::move ( mh ) ); +} + void print_as_list ( std::ostream & os ) { MeasurementEngine::INSTANCE.print_as_list ( os ); }