projects
/
SXSI
/
TextCollection.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add binary name to .gitignore
[SXSI/TextCollection.git]
/
HeapProfiler.cpp
diff --git
a/HeapProfiler.cpp
b/HeapProfiler.cpp
index
d3c46f8
..
63342a4
100644
(file)
--- a/
HeapProfiler.cpp
+++ b/
HeapProfiler.cpp
@@
-27,7
+27,7
@@
unsigned long HeapProfiler::consumption = 0, HeapProfiler::maxConsumption = 0;
AllocatedBlocks HeapProfiler::blocks;
// Override initialising hook from the C library.
AllocatedBlocks HeapProfiler::blocks;
// Override initialising hook from the C library.
-
void (*
__malloc_initialize_hook) (void) = HeapProfiler::InitHooks;
+
//void (* volatile
__malloc_initialize_hook) (void) = HeapProfiler::InitHooks;
// Variables to save original hooks.
void *(*HeapProfiler::old_malloc_hook)(size_t, const void *);
// Variables to save original hooks.
void *(*HeapProfiler::old_malloc_hook)(size_t, const void *);
@@
-37,6
+37,9
@@
void *(*HeapProfiler::old_realloc_hook)(void *, size_t, const void *);
unsigned long HeapProfiler::GetMaxHeapConsumption() {
return maxConsumption;
}
unsigned long HeapProfiler::GetMaxHeapConsumption() {
return maxConsumption;
}
+void HeapProfiler::ResetMaxHeapConsumption() {
+ maxConsumption = 0;
+}
unsigned long HeapProfiler::GetHeapConsumption() {
return consumption;
unsigned long HeapProfiler::GetHeapConsumption() {
return consumption;