ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-24 21:10:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

export PajeTrace.WriteMemoryChart() to python

Browse Source
This commit is contained in:
Matthias Hochsteger 2020-11-19 19:29:04 +01:00
parent f0152baacf
commit 87623981a6
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libsrc/core/paje_trace.cpp
View File

@ -742,7 +742,8 @@ namespace ngcore
} }
} }
} }
WriteSunburstHTML(); WriteTimingChart();
WriteMemoryChart("");
paje.WriteEvents(); paje.WriteEvents();
} }
@ -929,8 +930,10 @@ namespace ngcore
} }
void WriteMemorySunburstHTML( std::vector<PajeTrace::MemoryEvent> & events, std::string filename ) void PajeTrace::WriteMemoryChart( std::string fname )
{ {
if(fname=="")
fname = tracefile_name + "_memory";
size_t mem_allocated = 0; size_t mem_allocated = 0;
size_t max_mem_allocated = 0; size_t max_mem_allocated = 0;
size_t imax_mem_allocated = 0; size_t imax_mem_allocated = 0;
@ -944,9 +947,9 @@ namespace ngcore
mem_allocated_id = 0; mem_allocated_id = 0;
// Find point with maximum memory allocation, check for missing allocs/frees // Find point with maximum memory allocation, check for missing allocs/frees
for(auto i : IntRange(events.size())) for(auto i : IntRange(memory_events.size()))
{ {
const auto & ev = events[i]; const auto & ev = memory_events[i];
if(ev.is_alloc) if(ev.is_alloc)
{ {
@ -974,7 +977,7 @@ namespace ngcore
mem_allocated_id = 0; mem_allocated_id = 0;
for(auto i : IntRange(imax_mem_allocated+1)) for(auto i : IntRange(imax_mem_allocated+1))
{ {
const auto & ev = events[i]; const auto & ev = memory_events[i];
if(ev.is_alloc) if(ev.is_alloc)
mem_allocated_id[ev.id] += ev.size; mem_allocated_id[ev.id] += ev.size;
@ -1047,11 +1050,11 @@ namespace ngcore
nodes[parents[i]]->size += nodes[i]->size; nodes[parents[i]]->size += nodes[i]->size;
} }
WriteSunburstHTML( root, filename, false ); WriteSunburstHTML( root, fname, false );
} }
void PajeTrace::WriteSunburstHTML( ) void PajeTrace::WriteTimingChart( )
{ {
std::vector<TimerEvent> events; std::vector<TimerEvent> events;
@ -1140,7 +1143,6 @@ namespace ngcore
root.chart_size = 0.0; root.chart_size = 0.0;
ngcore::WriteSunburstHTML( root, tracefile_name, true ); ngcore::WriteSunburstHTML( root, tracefile_name, true );
WriteMemorySunburstHTML( memory_events, tracefile_name+"_memory" );
} }
} // namespace ngcore } // namespace ngcore

3
libsrc/core/paje_trace.hpp
View File

@ -30,7 +30,8 @@ namespace ngcore
int nthreads; int nthreads;
public: public:
void WriteSunburstHTML(); NGCORE_API void WriteTimingChart();
NGCORE_API void WriteMemoryChart( std::string fname );
// Approximate number of events to trace. Tracing will // Approximate number of events to trace. Tracing will
// be stopped if any thread reaches this number of events // be stopped if any thread reaches this number of events

7
libsrc/core/python_ngcore_export.cpp
View File

@ -263,9 +263,10 @@ threads : int
.def("__enter__", [](PajeTrace & self) { }) .def("__enter__", [](PajeTrace & self) { })
.def("__exit__", [](PajeTrace & self, py::args) { self.StopTracing(); }) .def("__exit__", [](PajeTrace & self, py::args) { self.StopTracing(); })
.def("__del__", [](PajeTrace & self) { trace = nullptr; }) .def("__del__", [](PajeTrace & self) { trace = nullptr; })
.def("SetTraceThreads", &PajeTrace::SetTraceThreads) .def_static("SetTraceThreads", &PajeTrace::SetTraceThreads)
.def("SetTraceThreadCounter", &PajeTrace::SetTraceThreadCounter) .def_static("SetTraceThreadCounter", &PajeTrace::SetTraceThreadCounter)
.def("SetMaxTracefileSize", &PajeTrace::SetMaxTracefileSize) .def_static("SetMaxTracefileSize", &PajeTrace::SetMaxTracefileSize)
.def_static("WriteMemoryChart", [](string filename){ if(trace) trace->WriteMemoryChart(filename); }, py::arg("filename")="memory" )
; ;