Skip to content

DPL: allow non-owning TFileFileSystem #15179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ktf merged 2 commits into from
Mar 17, 2026
+15 −7
Merged

DPL: allow non-owning TFileFileSystem #15179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f912318
DPL: protect against missing monitoring
ktf Mar 17, 2026
c9d07d8
DPL: allow non-owning TFileFileSystem
ktf Mar 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions Framework/AnalysisSupport/src/DataInputDirector.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,9 @@ void DataInputDescriptor::printFileOpening()
monitoringInfo += fmt::format(",se={},open_time={:.1f}", alienFile->GetSE(), alienFile->GetElapsed());
}
#endif
mContext.monitoring->send(o2::monitoring::Metric{monitoringInfo, "aod-file-open-info"}.addTag(o2::monitoring::tags::Key::Subsystem, o2::monitoring::tags::Value::DPL));
if (mContext.monitoring) {
mContext.monitoring->send(o2::monitoring::Metric{monitoringInfo, "aod-file-open-info"}.addTag(o2::monitoring::tags::Key::Subsystem, o2::monitoring::tags::Value::DPL));
}
LOGP(info, "Opening file: {}", monitoringInfo);
}

Expand All @@ -335,7 +337,9 @@ void DataInputDescriptor::printFileStatistics()
monitoringInfo += fmt::format(",se={},open_time={:.1f}", alienFile->GetSE(), alienFile->GetElapsed());
}
#endif
mContext.monitoring->send(o2::monitoring::Metric{monitoringInfo, "aod-file-read-info"}.addTag(o2::monitoring::tags::Key::Subsystem, o2::monitoring::tags::Value::DPL));
if (mContext.monitoring) {
mContext.monitoring->send(o2::monitoring::Metric{monitoringInfo, "aod-file-read-info"}.addTag(o2::monitoring::tags::Key::Subsystem, o2::monitoring::tags::Value::DPL));
}
LOGP(info, "Read info: {}", monitoringInfo);
}

Expand Down
3 changes: 2 additions & 1 deletion Framework/Core/include/Framework/RootArrowFilesystem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ class TFileFileSystem : public VirtualRootFileSystemBase
public:
arrow::Result<arrow::fs::FileInfo> GetFileInfo(const std::string& path) override;

TFileFileSystem(TDirectoryFile* f, size_t readahead, RootObjectReadingFactory&);
TFileFileSystem(TDirectoryFile* f, size_t readahead, RootObjectReadingFactory&, bool ownsFile = true);

~TFileFileSystem() override;

Expand All @@ -172,6 +172,7 @@ class TFileFileSystem : public VirtualRootFileSystemBase
private:
TDirectoryFile* mFile;
RootObjectReadingFactory& mObjectFactory;
bool mOwnsFile = true;
};

class TBufferFileFS : public VirtualRootFileSystemBase
Expand Down
11 changes: 7 additions & 4 deletions Framework/Core/src/RootArrowFilesystem.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,21 @@ namespace o2::framework
{
using arrow::Status;

TFileFileSystem::TFileFileSystem(TDirectoryFile* f, size_t readahead, RootObjectReadingFactory& factory)
TFileFileSystem::TFileFileSystem(TDirectoryFile* f, size_t readahead, RootObjectReadingFactory& factory, bool ownsFile)
: VirtualRootFileSystemBase(),
mFile(f),
mObjectFactory(factory)
mObjectFactory(factory),
mOwnsFile(ownsFile)
{
((TFile*)mFile)->SetReadaheadSize(50 * 1024 * 1024);
}

TFileFileSystem::~TFileFileSystem()
{
mFile->Close();
delete mFile;
if (mOwnsFile) {
mFile->Close();
delete mFile;
}
}

std::shared_ptr<RootObjectHandler> TFileFileSystem::GetObjectHandler(arrow::dataset::FileSource source)
Expand Down
Loading