Changeset 1181a3

Timestamp:

Apr 5, 2018, 1:19:33 PM (7 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

AutomationFragmentation_failures, Candidate_v1.6.1, ChemicalSpaceEvaluator, Enhanced_StructuralOptimization_continued, Exclude_Hydrogens_annealWithBondGraph, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_contraction-expansion, Gui_displays_atomic_force_velocity, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, PythonUI_with_named_parameters, StoppableMakroAction, TremoloParser_IncreasedPrecision

Children:

0542e2

Parents:

354a5f

git-author:

Frederik Heber <frederik.heber@…> (04/05/18 12:23:30)

git-committer:

Frederik Heber <frederik.heber@…> (04/05/18 13:19:33)

Message:

ControllerListener now also gets const ref to WorkerPool.

• this is preparatory for allowing Controller to obtain information about enlisted workers.

Location:

ThirdParty/JobMarket/src/JobMarket

Files:

• FragmentScheduler.cpp (modified) (1 diff)
• FragmentScheduler.hpp (modified) (2 diffs)

ThirdParty/JobMarket/src/JobMarket/FragmentScheduler.cpp

@@ -61 +61 @@
       boost::bind(&FragmentScheduler::sendJobToWorker, boost::ref(*this), _1, _2),
       boost::bind(&FragmentScheduler::unmarkWorkerBusy, boost::ref(*this), _1)),
-  ControllerListener(_io_service, controllerport, JobsQueue,
+  ControllerListener(_io_service, controllerport, JobsQueue, pool,
       boost::bind(&FragmentScheduler::removeAllWorkers, boost::ref(*this)),
       boost::bind(&FragmentScheduler::shutdown, boost::ref(*this))),

ThirdParty/JobMarket/src/JobMarket/FragmentScheduler.hpp

@@ -165 +165 @@
         unsigned short port,
         FragmentQueue &_JobsQueue,
+        WorkerPool &_pool,
         boost::function<void ()> _removeallWorkers,
         boost::function<bool ()> _shutdownAllSockets) :
       Listener(io_service, port),
       JobsQueue(_JobsQueue),
+      pool(_pool),
       jobInfo((size_t)2, 0),
       NumberIds(0),
@@ -209 +211 @@
     //!> reference to external FragmentQueue containing jobs to work on
     FragmentQueue & JobsQueue;
+
+    //!> const reference to external pool of Workers
+    const WorkerPool & pool;
 
     //!> bunch of jobs received from controller before placed in JobsQueue