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

mem tracing - use topological sorting, some fixes

Browse Source
This commit is contained in:
Matthias Hochsteger 2020-11-19 16:16:39 +01:00
parent b00c56a012
commit 6f98123e98
1 changed files with 43 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
libsrc/core/paje_trace.cpp
View File

@ -931,15 +931,16 @@ namespace ngcore
void WriteMemorySunburstHTML( std::vector<PajeTrace::MemoryEvent> & events, std::string filename ) void WriteMemorySunburstHTML( std::vector<PajeTrace::MemoryEvent> & events, std::string filename )
{ {
size_t mem_allocated; size_t mem_allocated = 0;
size_t max_mem_allocated; size_t max_mem_allocated = 0;
size_t imax_mem_allocated; size_t imax_mem_allocated = 0;
const auto & names = MemoryTracer::GetNames(); const auto & names = MemoryTracer::GetNames();
const auto & tree = MemoryTracer::GetTree(); const auto & tree = MemoryTracer::GetTree();
auto N = names.size(); size_t N = names.size();
Array<size_t> mem_allocated_id(N); Array<size_t> mem_allocated_id;
mem_allocated_id.SetSize(N);
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
@ -984,11 +985,16 @@ namespace ngcore
TreeNode root; TreeNode root;
root.name="all"; root.name="all";
Array<TreeNode*> nodes(N); Array<TreeNode*> nodes;
nodes.SetSize(N);
nodes = nullptr; nodes = nullptr;
Array<size_t> sorting; // topological sorting (parents before children)
sorting.SetAllocSize(N);
ArrayMem<size_t, 100> stack;
// find root nodes in memory tracer tree, i.e. they have no parents // find root nodes in memory tracer tree, i.e. they have no parents
Array<int> parents(N); Array<int> parents;
parents.SetSize(N);
parents = -1; parents = -1;
for( const auto & [iparent, children] : tree ) for( const auto & [iparent, children] : tree )
for (auto child_id : children) for (auto child_id : children)
@ -999,10 +1005,29 @@ namespace ngcore
} }
for(auto i : IntRange(1, N)) for(auto i : IntRange(1, N))
if(parents[i]==-1)
{
sorting.Append(i);
if(tree.count(i))
stack.Append(i);
}
while(stack.Size())
{ {
TreeNode * parent = &root; auto current = stack.Last();
if(parents[i]!=-1) stack.DeleteLast();
parent = nodes[parents[i]];
for(const auto child : tree.at(current))
{
sorting.Append(child);
if(tree.count(child))
stack.Append(child);
}
}
for(auto i : sorting)
{
TreeNode * parent = (parents[i]==-1) ? &root : nodes[parents[i]];
auto & node = parent->children[i]; auto & node = parent->children[i];
nodes[i] = &node; nodes[i] = &node;
@ -1012,11 +1037,15 @@ namespace ngcore
node.name = names[i]; node.name = names[i];
} }
for(auto i : IntRange(1, N)) for(auto i_ : Range(sorting))
if(parents[N-i]==-1) {
root.size += nodes[N-i]->size; // reverse topological order to accumulate total memory usage of all children
auto i = sorting[sorting.Size()-1-i_];
if(parents[i]==-1)
root.size += nodes[i]->size;
else else
nodes[parents[N-i]]->size += nodes[N-i]->size; nodes[parents[i]]->size += nodes[i]->size;
}
WriteSunburstHTML( root, filename, false ); WriteSunburstHTML( root, filename, false );