Changeset 387a84 for src/UIElements

Timestamp:

Feb 14, 2016, 12:34:28 PM (9 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:

e7ed12

Parents:

5aec20

git-author:

Frederik Heber <heber@…> (01/05/16 22:26:38)

git-committer:

Frederik Heber <heber@…> (02/14/16 12:34:28)

Message:

FIX: Added mutex to ObservedValuesContainer to ensure atomic access.

Location:

src/UIElements/Qt4/InstanceBoard

Files:

• ObservedValuesContainer.hpp (modified) (1 diff)
• ObservedValuesContainer_impl.hpp (modified) (14 diffs)

src/UIElements/Qt4/InstanceBoard/ObservedValuesContainer.hpp

@@ -216 +216 @@
   const onDestroy_t onDestroy;
 
+  //!> internal mutex to have atomic access to control maps
+  mutable boost::recursive_mutex atomic_mutex;
+
 private:
   /** Internal function to check whether an Observed instance identified by

src/UIElements/Qt4/InstanceBoard/ObservedValuesContainer_impl.hpp

@@ -18 +18 @@
 
 #include "CodePatterns/Assert.hpp"
+
+#include <boost/thread/recursive_mutex.hpp>
 
 template <class T, typename id>
@@ -32 +34 @@
 ObservedValuesContainer<T,id>::~ObservedValuesContainer()
 {
+  boost::recursive_mutex::scoped_lock lock(atomic_mutex);
   for (typename CountedObservedValues_t::iterator iter = ObservedValues.begin();
       iter != ObservedValues.end(); ++iter) {
@@ -47 +50 @@
 typename T::ptr ObservedValuesContainer<T,id>::get(const id _id)
 {
+  boost::recursive_mutex::scoped_lock lock(atomic_mutex);
   LOG(3, "DEBUG: ObservedValuesContainer got get() for an observed value of "
       << NameOfType << " " << _id);
@@ -60 +64 @@
     const id _id)
 {
+  boost::recursive_mutex::scoped_lock lock(atomic_mutex);
   LOG(3, "DEBUG: ObservedValuesContainer got markObservedValuesAsConnected() for an observed value of "
       << NameOfType << " " << _id);
@@ -73 +78 @@
     const id _id) const
 {
+  boost::recursive_mutex::scoped_lock lock(atomic_mutex);
   typename CountedObservedValues_t::const_iterator iter = ObservedValues.find(_id);
   return ((iter != ObservedValues.end()) && (iter->second.getEraseCandidate().second == 0));
@@ -81 +87 @@
     const id _id)
 {
+  boost::recursive_mutex::scoped_lock lock(atomic_mutex);
   LOG(3, "DEBUG: ObservedValuesContainer got markObservedValuesAsDisconnected() for an observed value of "
       << NameOfType << " " << _id);
@@ -100 +107 @@
     const id _id) const
 {
+  boost::recursive_mutex::scoped_lock lock(atomic_mutex);
   typename subjectKilledCount_t::const_iterator iter = subjectKilledCount.find(_id);
   return ((iter != subjectKilledCount.end()) && (iter->second == T::MAX_ObservedTypes));
@@ -107 +115 @@
 void ObservedValuesContainer<T,id>::countsubjectKilled(const id _id)
 {
+  boost::recursive_mutex::scoped_lock lock(atomic_mutex);
   LOG(3, "DEBUG: ObservedValuesContainer got subjectKilled() for an observed value of "
       << NameOfType << " " << _id);
@@ -127 +136 @@
 void ObservedValuesContainer<T,id>::removeObservedValues(const id _id)
 {
+  boost::recursive_mutex::scoped_lock lock(atomic_mutex);
   LOG(3, "DEBUG: ObservedValuesContainer removes " << NameOfType << " " << _id);
   // call callback function
@@ -141 +151 @@
 void ObservedValuesContainer<T,id>::eraseObservedValues(const id _id)
 {
+  boost::recursive_mutex::scoped_lock lock(atomic_mutex);
 #ifndef NDEBUG
   std::pair< typename std::set<id>::iterator, bool > inserter =
@@ -156 +167 @@
 bool ObservedValuesContainer<T,id>::checkMarkedForErase(const id _id) const
 {
+  boost::recursive_mutex::scoped_lock lock(atomic_mutex);
   return MarkedForErase.count(_id);
 }
@@ -162 +174 @@
 void ObservedValuesContainer<T,id>::insert(const id _id, const typename T::ptr &_obsvalues)
 {
+  boost::recursive_mutex::scoped_lock lock(atomic_mutex);
   typename ObservedValuesContainer<T,id>::RefCountedObserved::Value_t value(std::make_pair(_obsvalues,0));
   typename CountedObservedValues_t::iterator iter = ObservedValues.find(_id);
@@ -184 +197 @@
 bool ObservedValuesContainer<T,id>::changeIdentifier(const id _oldid, const id _newid)
 {
+  boost::recursive_mutex::scoped_lock lock(atomic_mutex);
   const typename CountedObservedValues_t::iterator Colditer = ObservedValues.find(_oldid);
   const typename CountedObservedValues_t::iterator Cnewiter = ObservedValues.find(_newid);
@@ -222 +236 @@
 bool ObservedValuesContainer<T,id>::isPresent(const id _id) const
 {
+  boost::recursive_mutex::scoped_lock lock(atomic_mutex);
   typename CountedObservedValues_t::const_iterator iter = ObservedValues.find(_id);
   return (iter != ObservedValues.end());