ITSMFT: decouple capacity estimator from slab sink statistics

Author: mpuccio

Detectors/ITSMFT/ITS/tracking/src/TrackerTraits.cxx

@@ -205,7 +205,8 @@ void TrackerTraits<NLayers>::computeLayerTracklets(const int iteration, int iVer
         });
         const auto st = sink.stats();
         sink.finalizeUnordered(tracklets);
-        mTimeFrame->getCapacityEstimator().update(key, scale, st);
+        mTimeFrame->getCapacityEstimator().update(key, scale, st.requested, st.capacity, st.emitted, st.spilled,
+                                                  st.overflowed, st.memoryLimited);
       });
     }
 
@@ -404,7 +405,8 @@ void TrackerTraits<NLayers>::computeLayerCells(const int iteration)
         });
         const auto st = sink.stats();
         sink.finalizeGrouped(size_t(currentLayerTrackletsNum), lut, layerCells);
-        mTimeFrame->getCapacityEstimator().update(key, scale, st);
+        mTimeFrame->getCapacityEstimator().update(key, scale, st.requested, st.capacity, st.emitted, st.spilled,
+                                                  st.overflowed, st.memoryLimited);
       } else {
         lut.resize(currentLayerTrackletsNum + 1);
         for (int iTracklet{0}; iTracklet < currentLayerTrackletsNum; ++iTracklet) {
@@ -554,7 +556,8 @@ void TrackerTraits<NLayers>::findCellsNeighbours(const int iteration)
         });
         const auto st = sink.stats();
         sink.finalizeUnordered(waveNeighbours);
-        mTimeFrame->getCapacityEstimator().update(key, scale, st);
+        mTimeFrame->getCapacityEstimator().update(key, scale, st.requested, st.capacity, st.emitted, st.spilled,
+                                                  st.overflowed, st.memoryLimited);
         tbb::parallel_sort(waveNeighbours.begin(), waveNeighbours.end(), neighbourLess);
       } else {
         for (const int cellTopologyId : activeTopologies) {
@@ -755,7 +758,8 @@ void TrackerTraits<NLayers>::processNeighbours(int iteration, int defaultCellTop
       });
       const auto st = sink.stats();
       sink.finalizeUnordered(updatedSeeds);
-      mTimeFrame->getCapacityEstimator().update(capacityKey, scale, st);
+      mTimeFrame->getCapacityEstimator().update(capacityKey, scale, st.requested, st.capacity, st.emitted, st.spilled,
+                                                st.overflowed, st.memoryLimited);
     }
   });
 }

Detectors/ITSMFT/common/tracking/include/ITSMFTTracking/CapacityEstimator.h

@@ -38,8 +38,6 @@ enum SlabSite : uint8_t {
 };
 constexpr const char* const SlabSiteNames[SlabSite::NSlabSite]{"Tracklets", "Cells", "Neighbours", "RoadCandidates", "Roads", "TrackSeeds", "TracksExtended", "Tracks"};
 
-struct SlabSinkStats;
-
 class CapacityEstimator
 {
  public:
@@ -125,7 +123,6 @@ class CapacityEstimator
   void update(uint64_t key, double scale, size_t emitted, size_t capacityUsed, bool overflowed, bool memoryLimited);
   void update(uint64_t key, double scale, size_t requested, size_t granted, size_t emitted,
               size_t spilled, bool overflowed, bool memoryLimited);
-  void update(uint64_t key, double scale, const SlabSinkStats& stats);
   void print() const;
 
  private:

Detectors/ITSMFT/common/tracking/src/CapacityEstimator.cxx

@@ -22,7 +22,6 @@
 #include <vector>
 
 #include "Framework/Logger.h"
-#include "ITSMFTTracking/SlabBumpAllocator.h"
 
 namespace o2::itsmft::tracking
 {
@@ -246,12 +245,6 @@ void CapacityEstimator::update(uint64_t key, double scale, size_t requested, siz
   mImpl->observe(key, scale, requested, granted, emitted, spilled, overflowed, memoryLimited);
 }
 
-void CapacityEstimator::update(uint64_t key, double scale, const SlabSinkStats& stats)
-{
-  update(key, scale, stats.requested, stats.capacity, stats.emitted, stats.spilled,
-         stats.overflowed, stats.memoryLimited);
-}
-
 void CapacityEstimator::print() const
 {
   std::lock_guard lock{mImpl->mutex};