Changeset 052afe for src

Timestamp:

Dec 4, 2010, 11:47:35 PM (14 years ago)

Author:

Frederik Heber <heber@…>

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:

41449c

Parents:

694d84

git-author:

Frederik Heber <heber@…> (11/09/10 16:16:58)

git-committer:

Frederik Heber <heber@…> (12/04/10 23:47:35)

Message:

MEMFIX: ofstreams in ...logger.hpp as static objects were not recognized by MemDebug.

• now they are allocated via new in the constructor of the ...logger's.
• Calling new ofstream(..) globally would cause segfaults in some unit tests.
• Constructor is private (due to logger's being singletons), hence this is safe.

NOTE: the problem is not the static object itself, but what is allocated
dynamically inside the object's constructor (this also concerns previous
fixes)

Location:

src

Files:

• Helpers/errorlogger.cpp (modified) (3 diffs)
• Helpers/logger.cpp (modified) (2 diffs)
• builder.cpp (modified) (2 diffs)

src/Helpers/errorlogger.cpp

@@ -26 +26 @@
 #include "Patterns/Singleton_impl.hpp"
 
-ofstream null("/dev/null");
 int errorLogger::verbosity = 2;
-ostream* errorLogger::nix = &null;
+ostream* errorLogger::nix = NULL;
 
 /**
@@ -36 +35 @@
  */
 errorLogger::errorLogger()
-{};
+{
+  nix = new ofstream("/dev/null");
+};
 
 /**
@@ -42 +43 @@
  */
 errorLogger::~errorLogger()
-{}
+{
+  delete nix;
+}
 
 CONSTRUCT_SINGLETON(errorLogger)

src/Helpers/logger.cpp

@@ -26 +26 @@
 #include "Patterns/Singleton_impl.hpp"
 
-ofstream nullStream("/dev/null");
 
 int logger::verbosity = 2;
-ostream* logger::nix = &nullStream;
+ostream* logger::nix = NULL;
 
 /**
@@ -37 +36 @@
  */
 logger::logger()
-{};
+{
+  nix = new ofstream("/dev/null");
+};
 
 /**
  * Destructor. Better use purgeInstance().
  */
-logger::~logger() {}
+logger::~logger()
+{
+  delete nix;
+}
 
 CONSTRUCT_SINGLETON(logger)

src/builder.cpp

@@ -115 +115 @@
   ChangeTracker::purgeInstance();
   World::purgeInstance();
-  logger::purgeInstance();
-  errorLogger::purgeInstance();
   UIFactory::purgeInstance();
   ValueStorage::purgeInstance();
@@ -123 +121 @@
   OptionRegistry::purgeInstance();
   ActionHistory::purgeInstance();
+  logger::purgeInstance();
+  errorLogger::purgeInstance();
 #ifdef LOG_OBSERVER
   cout << observerLog().getLog();