Changeset bca6b6 for ThirdParty/JobMarket

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:

354a5f

Parents:

322d58

git-author:

Frederik Heber <frederik.heber@…> (04/05/18 11:27:18)

git-committer:

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

Message:

OperationQueue states when queue is empty (instead of all are running).

File:

• ThirdParty/JobMarket/src/JobMarket/Operations/OperationQueue.cpp (modified) (1 diff)

ThirdParty/JobMarket/src/JobMarket/Operations/OperationQueue.cpp

@@ -73 +73 @@
   // connection available?
   if (getNumberOfRunningOps() < max_connections) {
-    // only start operation when address is valid
-    OperationQueue_t::iterator queueiter =
-        std::find_if(queue.begin(), queue.end(),
-            boost::bind(&AddressMap_t::count, boost::ref(AddressMap), boost::lambda::_1) );
-    if (queueiter != queue.end()) {
-      const AddressMap_t::iterator mapiter = AddressMap.find(*queueiter);
-      ASSERT( mapiter != AddressMap.end(),
-          "OperationQueue::LaunchNextOp() - cannot find connection "+toString((*queueiter)->getName())+" in AddressMap.");
-      currentOpsAddress = mapiter->second;
-      const AsyncOp_ptr ptr = mapiter->first;
-      // always erase the op from the list of ones pending for launch
-      AddressMap.erase(mapiter);
-      // only launch when not a debug op
-      if ((!currentOpsAddress.host.empty()) && (!currentOpsAddress.service.empty())) {
-        LOG(2, "DEBUG: Launching next operation " << ptr->getName() << ".");
-       (*ptr)(currentOpsAddress.host, currentOpsAddress.service);
+    if (!queue.empty()) {
+      // only start operation when address is valid
+      OperationQueue_t::iterator queueiter =
+          std::find_if(queue.begin(), queue.end(),
+              boost::bind(&AddressMap_t::count, boost::ref(AddressMap), boost::lambda::_1) );
+      if (queueiter != queue.end()) {
+        const AddressMap_t::iterator mapiter = AddressMap.find(*queueiter);
+        ASSERT( mapiter != AddressMap.end(),
+            "OperationQueue::LaunchNextOp() - cannot find connection "+toString((*queueiter)->getName())+" in AddressMap.");
+        currentOpsAddress = mapiter->second;
+        const AsyncOp_ptr ptr = mapiter->first;
+        // always erase the op from the list of ones pending for launch
+        AddressMap.erase(mapiter);
+        // only launch when not a debug op
+        if ((!currentOpsAddress.host.empty()) && (!currentOpsAddress.service.empty())) {
+          LOG(2, "DEBUG: Launching next operation " << ptr->getName() << ".");
+         (*ptr)(currentOpsAddress.host, currentOpsAddress.service);
+        } else {
+          LOG(3, "DEBUG: Skipping debug operation " << ptr->getName() << " with empty address.");
+        }
       } else {
-        LOG(3, "DEBUG: Skipping debug operation " << ptr->getName() << " with empty address.");
+        LOG(2, "DEBUG: All remaining operations are already running.");
       }
     } else {
-      LOG(2, "DEBUG: All remaining operations are already running.");
+      LOG(2, "DEBUG: There are no more operations in the queue.");
     }
   } else {