Changeset cd032d for src/World.cpp

Timestamp:

Mar 11, 2010, 2:46:41 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

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, Candidate_v1.7.0, 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:

68d781

Parents:

a77c96 (diff), ed58ad (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'StructureRefactoring' into QT4Refactoring

Conflicts:

molecuilder/src/builder.cpp
molecuilder/src/defs.hpp

File:

• src/World.cpp (modified) (3 diffs)

src/World.cpp

@@ -16 +16 @@
 #include "Descriptors/MoleculeDescriptor_impl.hpp"
 #include "Actions/ManipulateAtomsProcess.hpp"
+
+#include "Patterns/Singleton_impl.hpp"
 
 using namespace std;
@@ -229 +231 @@
 /******************************* Singleton Stuff **************************/
 
-// TODO: Hide boost-thread using Autotools stuff when no threads are used
-World* World::theWorld = 0;
-boost::mutex World::worldLock;
-
 World::World() :
     periode(new periodentafel),
@@ -261 +259 @@
 }
 
-World* World::get(){
-  // boost supports RAII-Style locking, so we don't need to unlock
-  boost::mutex::scoped_lock guard(worldLock);
-  if(!theWorld) {
-    theWorld = new World();
-  }
-  return theWorld;
-}
-
-void World::destroy(){
-  // boost supports RAII-Style locking, so we don't need to unlock
-  boost::mutex::scoped_lock guard(worldLock);
-  delete theWorld;
-  theWorld = 0;
-}
-
-World* World::reset(){
-  World* oldWorld = 0;
-  {
-    // boost supports RAII-Style locking, so we don't need to unlock
-    boost::mutex::scoped_lock guard(worldLock);
-
-    oldWorld = theWorld;
-    theWorld = new World();
-    // oldworld does not need protection any more,
-    // since we should have the only reference
-
-    // worldLock handles access to the pointer,
-    // not to the object
-  } // scope-end releases the lock
-
-  // we have to let all the observers know that the
-  // oldWorld was destroyed. oldWorld calls subjectKilled
-  // upon destruction. Every Observer getting that signal
-  // should see that it gets the updated new world
-  delete oldWorld;
-  return theWorld;
-}
+// Explicit instantiation of the singleton mechanism at this point
+
+CONSTRUCT_SINGLETON(World)
 
 /******************************* deprecated Legacy Stuff ***********************/