Changeset b66c22 for src/memoryallocator.hpp

Timestamp:

Oct 5, 2009, 2:50:43 PM (16 years ago)

Author:

metzler <metzler@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

c0917c

Parents:

29812d

Message:

#19 Observe memory usage

File:

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

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;