Changeset 7d0a4e

Timestamp:

Jul 25, 2015, 1:02:11 PM (10 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:

9d4f964

Parents:

9ad4d6

git-author:

Frederik Heber <heber@…> (06/17/15 17:15:04)

git-committer:

Frederik Heber <heber@…> (07/25/15 13:02:11)

Message:

Storing the id of the main thread in static global variable.

• this is preparatory for thread guard to be used in the context of Qt.

Files:

• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/ThreadGuard.hpp (added)
• src/builder_init.cpp (modified) (3 diffs)
• src/builder_init.hpp (modified) (1 diff)

configure.ac

@@ -190 +190 @@
 AC_CHECK_LIB(m, sqrt, , AC_MSG_ERROR([compatible libc math library not found]))
 
+# Pthreads
+ACX_PTHREAD()
+
 # Boost
 BOOST_REQUIRE([1.40])

src/Makefile.am

@@ -178 +178 @@
   molecule.hpp \
   types.hpp \
+  ThreadGuard.hpp \
   UIElements/UIFactory.hpp \
   version.h \

src/builder_init.cpp

@@ -45 +45 @@
 #include <iostream>
 #include <iterator>
+#ifdef HAVE_PTHREAD
+#include "ThreadGuard.hpp"
+#endif
 #include <string>
 
@@ -86 +89 @@
 }
 
+#ifdef HAVE_PTHREAD
+pthread_t actionqueue_global_threadid = 0;
+#endif
+
 /** General stuff to intialize before UI.
  *
@@ -98 +105 @@
 
   setVerbosity(1);
+
+#ifdef HAVE_PTHREAD
+  actionqueue_global_threadid = pthread_self();
+#endif
 
   // from this moment on, we need to be sure to deeinitialize in the correct order

src/builder_init.hpp

@@ -14 +14 @@
 #endif
 
-
 void ProgramHeader();
 void initGeneral();