Changeset e8f397 for src/Fragmentation

Timestamp:

Jun 29, 2012, 1:23:20 PM (13 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:

a06358c

Parents:

aec098

git-author:

Frederik Heber <heber@…> (03/07/12 10:36:43)

git-committer:

Frederik Heber <heber@…> (06/29/12 13:23:20)

Message:

PoolWorker is now truely listenting.

• does now (re-)initiateSocket() after first contact.
• FragmentScheduler does not remove after one job.
• TESTFIX: Changed all regression tests Fragmentation/Automation to use listening poolworkers.

Location:

src/Fragmentation/Automation

Files:

• FragmentScheduler.cpp (modified) (2 diffs)
• Pool/PoolWorker.cpp (modified) (1 diff)

src/Fragmentation/Automation/FragmentScheduler.cpp

@@ -236 +236 @@
   if (!e)
   {
-    FragmentJob::ptr job;
     if (JobsQueue.isJobPresent()) {
-      job = JobsQueue.popJob();
-    } else {
-      job = NoJob;
-    }
-    callback_sendJobToWorker(pool.getNextIdleWorker(), job);
+      FragmentJob::ptr job = JobsQueue.popJob();
+      callback_sendJobToWorker(pool.getNextIdleWorker(), job);
+    }
   }
   else
@@ -275 +272 @@
   // mark as idle
   pool.unmarkWorkerBusy(address);
-  // for now remove worker again from pool such that other may connect
-  pool.removeWorker(address);
 
   // erase result
   result.reset();
   LOG(1, "INFO: JobsQueue has " << JobsQueue.getDoneJobs() << " results.");
+
+  // send out new job if present
+  if (JobsQueue.isJobPresent()) {
+    FragmentJob::ptr job = JobsQueue.popJob();
+    callback_sendJobToWorker(pool.getNextIdleWorker(), job);
+  }
 }
 

src/Fragmentation/Automation/Pool/PoolWorker.cpp

@@ -97 +97 @@
       boost::asio::placeholders::error, conn));
     // and listen for following connections
-    //initiateSocket();
+    initiateSocket();
   }
   else