Changeset f45c08

Timestamp:

Jul 2, 2012, 8:31:47 AM (12 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:

9a6b895

Parents:

2e661a

git-author:

Frederik Heber <heber@…> (04/24/12 14:36:36)

git-committer:

Frederik Heber <heber@…> (07/02/12 08:31:47)

Message:

Implemented OperationQueue that takes care of AsyncOperations.

• this is preparatory to fixing FragmentScheduler: When more than one job is placed in the JobQueue at the same time and multiple workers are idling, then also multiple SendJobToWorkerOperations are required. So far there is only a single instance, hence it is overwritten and only the last worker gets its correct job.
• also added unit test on functionality of OperationQueue.

Location:

src/Fragmentation/Automation

Files:

• Makefile.am (modified) (2 diffs)
• Operations/OperationQueue.cpp (added)
• Operations/OperationQueue.hpp (added)
• unittests/Makefile.am (modified) (4 diffs)
• unittests/OperationQueueUnitTest.cpp (added)
• unittests/OperationQueueUnitTest.hpp (added)
• unittests/stubs/AsyncOperationStub.hpp (added)

src/Fragmentation/Automation/Makefile.am

@@ -44 +44 @@
 FRAGMENTATIONOPERATIONSSOURCE = \
   Operations/AsyncOperation.cpp \
+  Operations/OperationQueue.cpp \
   Operations/SyncOperation.cpp \
   Operations/Controllers/CheckResultsOperation.cpp \
@@ -61 +62 @@
   Operations/AsyncOperation.hpp \
   Operations/Operation.hpp \
+  Operations/OperationQueue.hpp \
   Operations/SyncOperation.hpp \
   Operations/Controllers/CheckResultsOperation.hpp \

src/Fragmentation/Automation/unittests/Makefile.am

@@ -8 +8 @@
   unittests/MPQCCommandJobUnitTest.cpp \
   unittests/MPQCDataUnitTest.cpp \
+  unittests/OperationQueueUnitTest.cpp \
   unittests/SystemCommandJobUnitTest.cpp \
   unittests/WorkerAddressUnitTest.cpp \
@@ -18 +19 @@
   unittests/MPQCCommandJobUnitTest.hpp \
   unittests/MPQCDataUnitTest.hpp \
+  unittests/OperationQueueUnitTest.hpp \
   unittests/SystemCommandJobUnitTest.hpp \
   unittests/WorkerAddressUnitTest.hpp \
@@ -28 +30 @@
   MPQCCommandJobUnitTest \
   MPQCDataUnitTest \
+  OperationQueueUnitTest \
   SystemCommandJobUnitTest \
   WorkerAddressUnitTest \
@@ -110 +113 @@
   ${CodePatterns_LIBS}
 
+OperationQueueUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
+OperationQueueUnitTest_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
+OperationQueueUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+  unittests/OperationQueueUnitTest.cpp \
+  unittests/OperationQueueUnitTest.hpp \
+  unittests/stubs/AsyncOperationStub.hpp
+OperationQueueUnitTest_LDADD = \
+  libMolecuilderFragmentationOperations.la \
+  libMolecuilderFragmentationAutomationHelper.la \
+  $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
+  ${CodePatterns_LIBS}
+
 SystemCommandJobUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
 SystemCommandJobUnitTest_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}