Changeset 9a9f847 for ThirdParty/CodePatterns

Timestamp:

Jun 19, 2017, 8:23:19 AM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, AutomationFragmentation_failures, Candidate_v1.6.1, ChangeBugEmailaddress, ChemicalSpaceEvaluator, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph_documentation, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, Fix_ChronosMutex, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, ForceAnnealing_oldresults, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, GeometryObjects, Gui_displays_atomic_force_velocity, IndependentFragmentGrids_IntegrationTest, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, RotateToPrincipalAxisSystem_UndoRedo, StoppableMakroAction, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps

Children:

61003d, 788dce, be848d

Parents:

51a013

git-author:

Frederik Heber <frederik.heber@…> (06/19/17 08:23:15)

git-committer:

Frederik Heber <frederik.heber@…> (06/19/17 08:23:19)

Message:

Chronos can now be safely used in multithread environements.

• this fixes a bug with JobMarket where JobMarketPoolWorker would crash because handle_ReceiveJobs and Work would both try to access Chronos.

Location:

ThirdParty/CodePatterns/src

Files:

• CodePatterns/Chronos.hpp (modified) (2 diffs)
• Helpers/Chronos.cpp (modified) (11 diffs)

ThirdParty/CodePatterns/src/CodePatterns/Chronos.hpp

@@ -17 +17 @@
 #include <map>
 #include <string>
+
+#include <boost/thread/recursive_mutex.hpp>
 
 #include "CodePatterns/Singleton.hpp"
@@ -131 +133 @@
 #endif
 #endif
+
+  //!> mutex for keeping chronos timekeeping atomic
+  mutable boost::recursive_mutex ChronosMutex;
 };
 

ThirdParty/CodePatterns/src/Helpers/Chronos.cpp

@@ -22 +22 @@
 #include <iostream>
 
+#include <boost/thread/locks.hpp>
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -32 +34 @@
 # include <time.h>
 #endif
-
 
 #include "CodePatterns/Chronos.hpp"
@@ -69 +70 @@
 double Chronos::getTime(const std::string &_name) const
 {
+  boost::recursive_mutex::scoped_lock lock(ChronosMutex);
   // only those functions have a time that have run already
   if (AccountedTime.count(_name) != 0) {
@@ -82 +84 @@
 void Chronos::resetTime(const std::string &_name)
 {
+  boost::recursive_mutex::scoped_lock lock(ChronosMutex);
   // set accounted time to zero
   if (AccountedTime.count(_name) != 0) {
@@ -93 +96 @@
 void Chronos::startTiming(const std::string &_name)
 {
+  boost::recursive_mutex::scoped_lock lock(ChronosMutex);
   // start time keeping
   if ((RecursionMap.count(_name) == 0) || (RecursionMap[_name] == 0)) {
@@ -106 +110 @@
     const sec_ncsec_t &_time2)
 {
-        double currenttime = 0.;
+  double currenttime = 0.;
   if (_time1.second < _time2.second)
                 currenttime = (_time1.first - _time2.first - 1)
@@ -118 +122 @@
 double Chronos::getCurrentTime() const
 {
+  boost::recursive_mutex::scoped_lock lock(ChronosMutex);
 #ifdef HAVE_TIME_H
   // clock_gettime gives nanoseconds accuracy
@@ -158 +163 @@
 void Chronos::endTiming(const std::string &_name)
 {
+  boost::recursive_mutex::scoped_lock lock(ChronosMutex);
   // check whether we are the topmost function, return if not
   if (--RecursionMap[_name] != 0)
@@ -183 +189 @@
 double Chronos::SumUpTotalTime() const
 {
+  boost::recursive_mutex::scoped_lock lock(ChronosMutex);
   double sum = 0.;
   for (TimekeepingMap::const_iterator iter = AccountedTime.begin();
@@ -194 +201 @@
 size_t Chronos::SumUpTotalFunctions() const
 {
+  boost::recursive_mutex::scoped_lock lock(ChronosMutex);
   return AccountedTime.size();
 }
@@ -199 +207 @@
 std::ostream& operator<<(std::ostream &ost, const Chronos &_time)
 {
+  boost::recursive_mutex::scoped_lock lock(_time.ChronosMutex);
   ost << "List of functions present:" << std::endl;
   for (Chronos::TimekeepingMap::const_iterator iter = _time.AccountedTime.begin();