diff --git a/tree/treeplayer/inc/ROOT/TDFNodes.hxx b/tree/treeplayer/inc/ROOT/TDFNodes.hxx index 16f1581b80c23..011e7e0e85d5a 100644 --- a/tree/treeplayer/inc/ROOT/TDFNodes.hxx +++ b/tree/treeplayer/inc/ROOT/TDFNodes.hxx @@ -79,6 +79,7 @@ class TLoopManager : public std::enable_shared_from_this { void InitNodeSlots(TTreeReader *r, unsigned int slot); void InitNodes(); void CleanUpNodes(); + void CleanUpTask(unsigned int slot); void JitActions(); void EvalChildrenCounts(); @@ -164,7 +165,6 @@ public: void MakeProxy(TTreeReader *r, const std::string &bn) { - Reset(); bool useReaderValue = std::is_same::value; if (useReaderValue) fReaderValue.reset(new TTreeReaderValue(*r, bn.c_str())); @@ -213,6 +213,15 @@ struct TTDFValueTuple> { template using TDFValueTuple_t = typename TTDFValueTuple::type; +/// Clear the proxies of a tuple of TColumnValues +template +void ResetTDFValueTuple(ValueTuple& values, StaticSeq) +{ + // hack to expand a parameter pack without c++17 fold expressions. + std::initializer_list expander{(std::get(values).Reset(), 0)...}; + (void)expander; // avoid "unused variable" warnings +} + class TActionBase { protected: TLoopManager *fImplPtr; ///< A raw pointer to the TLoopManager at the root of this functional @@ -230,6 +239,7 @@ public: virtual void Run(unsigned int slot, Long64_t entry) = 0; virtual void InitSlot(TTreeReader *r, unsigned int slot) = 0; virtual void TriggerChildrenCount() = 0; + virtual void ClearValueReaders(unsigned int slot) = 0; unsigned int GetNSlots() const { return fNSlots; } }; @@ -275,6 +285,11 @@ public: void TriggerChildrenCount() final { fPrevData.IncrChildrenCount(); } ~TAction() { fHelper.Finalize(); } + + virtual void ClearValueReaders(unsigned int slot) final + { + ResetTDFValueTuple(fValues[slot], TypeInd_t()); + } }; } // end NS TDF @@ -311,6 +326,7 @@ public: virtual void Update(unsigned int slot, Long64_t entry) = 0; virtual void IncrChildrenCount() = 0; virtual void StopProcessing() = 0; + virtual void ClearValueReaders(unsigned int slot) = 0; void ResetChildrenCount() { fNChildren = 0; @@ -401,6 +417,11 @@ public: if (fNChildren == 1) fPrevData.IncrChildrenCount(); } + + virtual void ClearValueReaders(unsigned int slot) final + { + ResetTDFValueTuple(fValues[slot], TypeInd_t()); + } }; class TFilterBase { @@ -440,6 +461,7 @@ public: virtual void TriggerChildrenCount() = 0; unsigned int GetNSlots() const { return fNSlots; } virtual void ResetReportCount() = 0; + virtual void ClearValueReaders(unsigned int slot) = 0; }; template @@ -531,6 +553,11 @@ public: std::fill(fAccepted.begin(), fAccepted.end(), 0); std::fill(fRejected.begin(), fRejected.end(), 0); } + + virtual void ClearValueReaders(unsigned int slot) final + { + ResetTDFValueTuple(fValues[slot], TypeInd_t()); + } }; class TRangeBase { @@ -641,7 +668,6 @@ template void ROOT::Internal::TDF::TColumnValue::SetTmpColumn(unsigned int slot, ROOT::Detail::TDF::TCustomColumnBase *tmpColumn) { - Reset(); fTmpColumn = tmpColumn; if (tmpColumn->GetTypeId() != typeid(T)) throw std::runtime_error(std::string("TColumnValue: type specified is ") + typeid(T).name() + diff --git a/tree/treeplayer/src/TDFNodes.cxx b/tree/treeplayer/src/TDFNodes.cxx index 49ec80a572a90..dd405b3295875 100644 --- a/tree/treeplayer/src/TDFNodes.cxx +++ b/tree/treeplayer/src/TDFNodes.cxx @@ -169,6 +169,7 @@ void TLoopManager::RunEmptySourceMT() for (auto currEntry = range.first; currEntry < range.second; ++currEntry) { RunAndCheckFilters(slot, currEntry); } + CleanUpTask(slot); slotStack.Push(slot); }; @@ -203,6 +204,7 @@ void TLoopManager::RunTreeProcessorMT() while (r.Next()) { RunAndCheckFilters(slot, r.GetCurrentEntry()); } + CleanUpTask(slot); slotStack.Push(slot); }); #endif // not implemented otherwise @@ -273,6 +275,15 @@ void TLoopManager::CleanUpNodes() for (auto &pair : fBookedBranches) pair.second->ResetChildrenCount(); } +/// Perform clean-up operations. To be called at the end of each task execution. +// TODO in case of interleaved task execution, each task must clear the readervalues in its task slot +void TLoopManager::CleanUpTask(unsigned int slot) +{ + for (auto &ptr : fBookedActions) ptr->ClearValueReaders(slot); + for (auto &ptr : fBookedFilters) ptr->ClearValueReaders(slot); + for (auto &pair : fBookedBranches) pair.second->ClearValueReaders(slot); +} + /// Jit all actions that required runtime column type inference, and clean the `fToJit` member variable. void TLoopManager::JitActions() {