Changeset 14db08

Timestamp:

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

Author:

metzler <metzler@…>

Children:

7794d8

Parents:

390a2b

Message:

#19 Observe memory usage

Location:

molecuilder/src

Files:

• Makefile.am (modified) (2 diffs, 1 prop)
• builder.cpp (modified) (4 diffs, 1 prop)
• helpers.cpp (modified) (2 diffs, 1 prop)
• memoryallocator.hpp (modified) (5 diffs, 1 prop)
• memoryusageobserver.cpp (added)
• memoryusageobserver.hpp (added)
• memoryusageobserverunittest.cpp (added)
• memoryusageobserverunittest.hpp (added)

molecuilder/src/Makefile.am

@@ -1 +1 @@
 SOURCE = atom.cpp bond.cpp boundary.cpp config.cpp element.cpp ellipsoid.cpp helpers.cpp leastsquaremin.cpp linkedcell.cpp moleculelist.cpp molecules.cpp parser.cpp periodentafel.cpp tesselation.cpp tesselationhelpers.cpp vector.cpp verbose.cpp
-HEADER = atom.hpp bond.hpp boundary.hpp config.hpp defs.hpp element.hpp ellipsoid.hpp helpers.hpp leastsquaremin.hpp linkedcell.hpp molecules.hpp parser.hpp periodentafel.hpp stackclass.hpp tesselation.hpp tesselationhelpers.hpp vector.hpp verbose.hpp
+HEADER = atom.hpp bond.hpp boundary.hpp config.hpp defs.hpp element.hpp ellipsoid.hpp helpers.hpp leastsquaremin.hpp linkedcell.hpp memoryallocator.hpp memoryusageobserver.cpp memoryusageobserver.hpp molecules.hpp parser.hpp periodentafel.hpp stackclass.hpp tesselation.hpp tesselationhelpers.hpp vector.hpp verbose.hpp
 
-noinst_PROGRAMS =  VectorUnitTest MemoryAllocatorUnitTest
+noinst_PROGRAMS =  VectorUnitTest MemoryAllocatorUnitTest MemoryUsageObserverUnitTest
 
 bin_PROGRAMS = molecuilder joiner analyzer
@@ -8 +8 @@
 molecuilder_DATA = elements.db valence.db orbitals.db Hbonddistance.db Hbondangle.db
 molecuilder_SOURCES =  ${SOURCE} builder.cpp  ${HEADER}
-joiner_SOURCES = joiner.cpp datacreator.cpp element.cpp helpers.cpp periodentafel.cpp parser.cpp verbose.cpp datacreator.hpp helpers.hpp parser.hpp periodentafel.hpp 
-analyzer_SOURCES = analyzer.cpp datacreator.cpp element.cpp helpers.cpp periodentafel.cpp parser.cpp verbose.cpp helpers.hpp periodentafel.hpp parser.hpp datacreator.hpp 
+joiner_SOURCES = joiner.cpp datacreator.cpp element.cpp helpers.cpp memoryallocator.hpp memoryusageobserver.cpp memoryusageobserver.hpp periodentafel.cpp parser.cpp verbose.cpp datacreator.hpp helpers.hpp parser.hpp periodentafel.hpp 
+analyzer_SOURCES = analyzer.cpp datacreator.cpp element.cpp helpers.cpp memoryallocator.hpp memoryusageobserver.cpp memoryusageobserver.hpp periodentafel.cpp parser.cpp verbose.cpp helpers.hpp periodentafel.hpp parser.hpp datacreator.hpp 
 
 TESTS = VectorUnitTest MemoryAllocatorUnitTest
 check_PROGRAMS = $(TESTS)
-VectorUnitTest_SOURCES = defs.hpp helpers.cpp helpers.hpp leastsquaremin.cpp leastsquaremin.hpp vectorunittest.cpp vectorunittest.hpp vector.cpp vector.hpp verbose.cpp verbose.hpp 
+VectorUnitTest_SOURCES = defs.hpp helpers.cpp helpers.hpp leastsquaremin.cpp leastsquaremin.hpp memoryallocator.hpp memoryusageobserver.cpp memoryusageobserver.hpp vectorunittest.cpp vectorunittest.hpp vector.cpp vector.hpp verbose.cpp verbose.hpp 
 VectorUnitTest_CXXFLAGS = $(CPPUNIT_CFLAGS)
 VectorUnitTest_LDFLAGS = $(CPPUNIT_LIBS) -ldl
 
-MemoryAllocatorUnitTest_SOURCES = defs.hpp helpers.cpp helpers.hpp memoryallocatorunittest.cpp memoryallocatorunittest.hpp memoryallocator.hpp verbose.cpp verbose.hpp 
+MemoryAllocatorUnitTest_SOURCES = defs.hpp helpers.cpp helpers.hpp memoryallocatorunittest.cpp memoryallocatorunittest.hpp memoryallocator.hpp memoryusageobserver.cpp memoryusageobserver.hpp verbose.cpp verbose.hpp 
 MemoryAllocatorUnitTest_CXXFLAGS = $(CPPUNIT_CFLAGS)
 MemoryAllocatorUnitTest_LDFLAGS = $(CPPUNIT_LIBS) -ldl
 
+MemoryUsageObserverUnitTest_SOURCES = defs.hpp helpers.cpp helpers.hpp memoryusageobserverunittest.cpp memoryusageobserverunittest.hpp memoryusageobserver.hpp memoryusageobserver.cpp verbose.cpp verbose.hpp 
+MemoryUsageObserverUnitTest_CXXFLAGS = $(CPPUNIT_CFLAGS)
+MemoryUsageObserverUnitTest_LDFLAGS = $(CPPUNIT_LIBS) -ldl
 
 EXTRA_DIST = ${molecuilder_DATA}

molecuilder/src/builder.cpp

@@ -53 +53 @@
 #include "ellipsoid.hpp"
 #include "helpers.hpp"
+#include "memoryusageobserverunittest.hpp"
 #include "molecules.hpp"
 /********************************************* Subsubmenu routine ************************************/
@@ -1542 +1543 @@
                   delete(Subgraphs);
                   for (int i=0;i<FragmentCounter;i++)
-                    Free((void **)&ListOfLocalAtoms[FragmentCounter], "ParseCommandLineOptions: **ListOfLocalAtoms[]");
-                  Free((void **)&ListOfLocalAtoms, "ParseCommandLineOptions: ***ListOfLocalAtoms");
+                    Free(&ListOfLocalAtoms[FragmentCounter]);
+                  Free(&ListOfLocalAtoms);
                 }
                 delete(BackEdgeStack);
@@ -2021 +2022 @@
       delete(molecules); // also free's all molecules contained
       delete(periode);
+      cout << Verbose(0) <<  "Remaining non-freed memory: "
+        << MemoryUsageObserver::getInstance()->getUsedMemorySize() << endl;
       return 0;
       break;
@@ -2119 +2122 @@
   delete(molecules); // also free's all molecules contained
   delete(periode);
+
+  cout << Verbose(0) <<  "Remaining non-freed memory: "
+    << MemoryUsageObserver::getInstance()->getUsedMemorySize() << endl;
+
   return (0);
 }

molecuilder/src/helpers.cpp

@@ -6 +6 @@
 
 #include "helpers.hpp"
+#include "memoryusageobserver.hpp"
 
 /********************************************** helpful functions *********************************/
@@ -133 +134 @@
   buffer[size] = '\0';
 
-  if (buffer == NULL)
+  if (buffer != NULL) {
+    MemoryUsageObserver::getInstance()->addMemory(buffer, size);
+  } else {
     cout << Verbose(0) << "Malloc for datatype " << typeid(char).name()
       << " failed - pointer is NULL: " << output << endl;
+  }
 
   return buffer;

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;