Changeset 14db08 for molecuilder/src/memoryallocator.hpp

Timestamp:

Oct 5, 2009, 2:12:18 PM (16 years ago)

Author:

metzler <metzler@…>

Children:

7794d8

Parents:

390a2b

Message:

#19 Observe memory usage

File:

• molecuilder/src/memoryallocator.hpp (modified) (5 diffs, 1 prop)

molecuilder/src/memoryallocator.hpp

@@ -24 +24 @@
 #include "defs.hpp"
 #include "verbose.hpp"
+#include "memoryusageobserver.hpp"
 
 /******************* wrappers for memory allocation functions ***********************/
@@ -40 +41 @@
   buffer = (X*) malloc(sizeof(X) * size);
 
-  if (buffer == NULL)
+  if (buffer != NULL) {
+    MemoryUsageObserver::getInstance()->addMemory(buffer, size);
+  } else {
     cout << Verbose(0) << "Malloc for datatype " << typeid(X).name()
       << " failed - pointer is NULL: " << output << endl;
+  }
 
   return buffer;
@@ -62 +66 @@
   X* buffer = NULL;
   buffer = (X*) calloc(sizeof(X) * size, (size_t) 0);
-  if (buffer == NULL)
+
+  if (buffer != NULL) {
+    MemoryUsageObserver::getInstance()->addMemory(buffer, size);
+  } else {
     cout << Verbose(0) << "Calloc for datatype " << typeid(X).name()
       << " failed - pointer is NULL: " << output << endl;
+  }
 
   return buffer;
@@ -82 +90 @@
 {
   X* buffer = NULL;
-  if (OldPointer == NULL)
+  if (OldPointer == NULL) {
     buffer = (X*) malloc(sizeof(X) * size);
-  else
+  } else {
     buffer = (X*) realloc(OldPointer, sizeof(X) * size);
-  if (buffer == NULL)
+    MemoryUsageObserver::getInstance()->removeMemory(OldPointer);
+  }
+  if (buffer != NULL) {
+    MemoryUsageObserver::getInstance()->addMemory(buffer, size);
+  } else {
     cout << Verbose(0) << "ReAlloc for datatype " << typeid(X).name()
       << " failed - new is NULL: " << output << endl;
+  }
 
   return buffer;
@@ -103 +116 @@
     return;
 
+  MemoryUsageObserver::getInstance()->removeMemory(*buffer);
   free(*buffer);
   *buffer = NULL;