Changeset 694d84 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:

052afe

Parents:

95c0ab

git-author:

Frederik Heber <heber@…> (11/09/10 15:42:30)

git-committer:

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

Message:

MEMFIX: static factories map of UIFactory was not clear()'ed in destructor.

• hence, boost::shared_ptr still had a user and have not been deleted.
• TESTFIX: ActionSequenceTest and manipulateAtomsTest segfault.
  • the problem was the static hasDescriptor boolean. It made the dummy factory

getting registered only once, despite its being removed during UIFactory

purgeInstance() in tearDown().

• hasDescriptor is now a member variable and set to false in tearDown().

Location:

src

Files:

• UIElements/UIFactory.cpp (modified) (1 diff)
• unittests/ActionSequenceTest.cpp (modified) (2 diffs)
• unittests/ActionSequenceTest.hpp (modified) (1 diff)
• unittests/manipulateAtomsTest.cpp (modified) (2 diffs)
• unittests/manipulateAtomsTest.hpp (modified) (1 diff)

src/UIElements/UIFactory.cpp

@@ -34 +34 @@
 
 UIFactory::~UIFactory()
-{}
+{
+  // clear out factories map to allow boost::shared_ptr to do their work (i.e. to release mem)
+  // this is necessary as factories is a static object
+  factories.clear();
+}
 
 void UIFactory::makeUserInterface(std::string type) {

src/unittests/ActionSequenceTest.cpp

@@ -146 +146 @@
 
 void ActionSequenceTest::setUp(){
-  static bool hasDescriptor = false;
+  hasDescriptor = false;
   ActionHistory::init();
   // TODO: find a way to really reset the factory to a clean state in tear-down
@@ -183 +183 @@
   ActionHistory::purgeInstance();
   ActionRegistry::purgeInstance();
-  UIFactory::purgeInstance();
+  {
+    UIFactory::purgeInstance();
+    hasDescriptor = false;
+  }
 }
 

src/unittests/ActionSequenceTest.hpp

@@ -39 +39 @@
   wasCalledActionStub* shouldNotCall1;
   wasCalledActionStub* shouldNotCall2;
+  bool hasDescriptor;
 };
 

src/unittests/manipulateAtomsTest.cpp

@@ -86 +86 @@
 // set up and tear down
 void manipulateAtomsTest::setUp(){
-  static bool hasDescriptor = false;
+  hasDescriptor = false;
   ActionHistory::init();
   World::getInstance();
@@ -104 +104 @@
   ActionRegistry::purgeInstance();
   ActionHistory::purgeInstance();
-  UIFactory::purgeInstance();
+  {
+    UIFactory::purgeInstance();
+    hasDescriptor = false;
+  }
 }
 

src/unittests/manipulateAtomsTest.hpp

@@ -34 +34 @@
 private:
   atom *atoms [ATOM_COUNT];
+  bool hasDescriptor;
 };