ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-11-11 16:49:16 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mem_trace_only_when_owns' into 'master'

Browse Source 
trace memory free only when array owns memory

See merge request jschoeberl/netgen!377
This commit is contained in:
Joachim Schöberl 2021-04-07 09:18:43 +00:00
commit d10c1e14d3
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libsrc/core/array.hpp
View File

@ -792,8 +792,9 @@ namespace ngcore
/// if responsible, deletes memory
NETGEN_INLINE ~Array()
{
if(mem_to_delete)
mt.Free(sizeof(T)*allocsize);
delete [] mem_to_delete;
mt.Free(sizeof(T)*allocsize);
}
// Only provide this function if T is archivable
@ -847,8 +848,9 @@ namespace ngcore
/// assigns memory from local heap
NETGEN_INLINE const Array & Assign (size_t asize, LocalHeap & lh)
{
if(mem_to_delete)
mt.Free(sizeof(T)*allocsize);
delete [] mem_to_delete;
mt.Free(sizeof(T)*allocsize);
size = allocsize = asize;
data = lh.Alloc<T> (asize);
mem_to_delete = nullptr;
@ -955,8 +957,9 @@ namespace ngcore
/// Deallocate memory
NETGEN_INLINE void DeleteAll ()
{
if(mem_to_delete)
mt.Free(sizeof(T)*allocsize);
delete [] mem_to_delete;
mt.Free(sizeof(T)*allocsize);
mem_to_delete = NULL;
data = 0;
size = allocsize = 0;
@ -1108,8 +1111,9 @@ namespace ngcore
else
for (size_t i = 0; i < mins; i++) data[i] = std::move(hdata[i]);
#endif
if(mem_to_delete)
mt.Free(sizeof(T) * allocsize);
delete [] mem_to_delete;
mt.Free(sizeof(T) * allocsize);
}
mem_to_delete = data;