DPL: handle time-pipelining when enumerating

Timers are still most likely broken.

Author: ktf

Framework/Core/include/Framework/LifetimeHelpers.h

@@ -32,7 +32,7 @@ struct LifetimeHelpers {
   static ExpirationHandler::Creator dataDrivenCreation();
   /// Callback which creates a new timeslice as soon as one is available and
   /// uses an incremental number as timestamp.
-  static ExpirationHandler::Creator enumDrivenCreation(size_t first, size_t last, size_t step);
+  static ExpirationHandler::Creator enumDrivenCreation(size_t first, size_t last, size_t step, size_t inputTimeslice, size_t maxTimeSliceId);
   /// Callback which creates a new timeslice when timer
   /// expires and there is not a compatible datadriven callback
   /// available.

Framework/Core/src/DeviceSpecHelpers.cxx

@@ -56,16 +56,16 @@ struct ExpirationHandlerHelpers {
     };
   }
 
-  static RouteConfigurator::CreationConfigurator enumDrivenConfigurator(InputSpec const& matcher)
+  static RouteConfigurator::CreationConfigurator enumDrivenConfigurator(InputSpec const& matcher, size_t inputTimeslice, size_t maxInputTimeslices)
   {
-    return [matcher](ConfigParamRegistry const& options) {
+    return [matcher, inputTimeslice, maxInputTimeslices](ConfigParamRegistry const& options) {
       std::string startName = std::string{"start-value-"} + matcher.binding;
       std::string endName = std::string{"end-value-"} + matcher.binding;
       std::string stepName = std::string{"step-value-"} + matcher.binding;
       auto start = options.get<int64_t>(startName.c_str());
       auto stop = options.get<int64_t>(endName.c_str());
       auto step = options.get<int64_t>(stepName.c_str());
-      return LifetimeHelpers::enumDrivenCreation(start, stop, step);
+      return LifetimeHelpers::enumDrivenCreation(start, stop, step, inputTimeslice, maxInputTimeslices);
     };
   }
 
@@ -557,7 +557,7 @@ void DeviceSpecHelpers::processInEdgeActions(std::vector<DeviceSpec>& devices,
         break;
       case Lifetime::Enumeration:
         route.configurator = {
-          ExpirationHandlerHelpers::enumDrivenConfigurator(inputSpec),
+          ExpirationHandlerHelpers::enumDrivenConfigurator(inputSpec, consumerDevice.inputTimesliceId, consumerDevice.maxInputTimeslices),
           ExpirationHandlerHelpers::danglingEnumerationConfigurator(inputSpec),
           ExpirationHandlerHelpers::expiringEnumerationConfigurator(inputSpec, sourceChannel)};
         break;

Framework/Core/src/LifetimeHelpers.cxx

@@ -50,18 +50,18 @@ ExpirationHandler::Creator LifetimeHelpers::dataDrivenCreation()
   };
 }
 
-ExpirationHandler::Creator LifetimeHelpers::enumDrivenCreation(size_t start, size_t end, size_t step)
+ExpirationHandler::Creator LifetimeHelpers::enumDrivenCreation(size_t start, size_t end, size_t step, size_t inputTimeslice, size_t maxInputTimeslices)
 {
   auto last = std::make_shared<size_t>(start);
-  return [start, end, step, last](TimesliceIndex& index) -> TimesliceSlot {
+  return [start, end, step, last, inputTimeslice, maxInputTimeslices](TimesliceIndex& index) -> TimesliceSlot {
     for (size_t si = 0; si < index.size(); si++) {
       if (*last > end) {
         return TimesliceSlot{TimesliceSlot::INVALID};
       }
       auto slot = TimesliceSlot{si};
       if (index.isValid(slot) == false) {
         TimesliceId timestamp{*last};
-        *last += step;
+        *last += step * (maxInputTimeslices + inputTimeslice);
         index.associate(timestamp, slot);
         return slot;
       }