Use RB::GetTempFS(), no need for extern static scratchDir

Also no need for RDataFrameBench.h anymore

Author: eguiraud

root/tree/dataframe/RDataFrameBench.h

@@ -1,4 +1,3 @@
-#include "RDataFrameBench.h"
 #include "ROOT/RDataFrame.hxx"
 #include "TROOT.h"   // ROOT::EnableImplicitMT
 #include "TSystem.h" // TSystem::Unlink
@@ -10,8 +9,6 @@
 
 using namespace ROOT;
 
-const std::string scratchDir = RB::GetTempFs();
-
 static void BM_RDataFrame_CreateEmpty(benchmark::State &state)
 {
    for (auto _ : state)
@@ -21,7 +18,7 @@ BENCHMARK(BM_RDataFrame_CreateEmpty)->Unit(benchmark::kMicrosecond);
 
 static void BM_RDataFrame_CreateFromFile(benchmark::State &state)
 {
-   const auto fname = scratchDir + "/tdf_createfromfile.root";
+   const auto fname = RB::GetTempFs() + "/tdf_createfromfile.root";
    const auto treeName = "t";
    RDataFrame(0).Snapshot<>(treeName, fname, {});
 
@@ -79,7 +76,7 @@ BENCHMARK(BM_RDataFrame_NoOpLoop)->Unit(benchmark::kMicrosecond)->Arg(0)->Arg(1)
 
 static void BM_RDataFrame_NoOpLoopOnFile(benchmark::State &state)
 {
-   const auto fname = scratchDir + "/tdf_nooplooponfile" + std::to_string(state.range(0)) + ".root";
+   const auto fname = RB::GetTempFs() + "/tdf_nooplooponfile" + std::to_string(state.range(0)) + ".root";
    const auto treeName = "t";
    RDataFrame(state.range(0)).Snapshot<>(treeName, fname, {});
 

root/tree/dataframe/RDataFrameBenchmarks.cxx

@@ -1,4 +1,3 @@
-#include "RDataFrameBench.h"
 #include <ROOT/RDataFrame.hxx>
 #include <ROOT/RVec.hxx>
 #include <TFile.h>
@@ -14,17 +13,19 @@
 #include <vector>
 #include <cstring>
 
+#include "rootbench/RBConfig.h"
+
 using ROOT::RVec;
 
 static constexpr auto treeName = "Events";
 static constexpr auto fileName = "data.root";
 static constexpr auto scalarBranch = "x";
 static constexpr auto vectorBranch = "vec";
 static constexpr auto nEntries = 100000;
-static const auto pathToFile = scratchDir + "/" + fileName;
+static const auto pathToFile = RB::GetTempFs() + "/" + fileName;
 
 
-void ensure(bool b)
+inline void ensure(bool b)
 {
    if (!b)
       std::abort();

root/tree/dataframe/RDataFrameSumBenchmarks.cxx

@@ -1,4 +1,3 @@
-#include "RDataFrameBench.h"
 #include <TFile.h>
 #include <TSystem.h>
 #include <TTree.h>
@@ -8,21 +7,17 @@
 #include <vector>
 #include "rootbench/RBConfig.h"
 
-const std::string scratchDir = RB::GetTempFs();
-
 static constexpr auto treeName = "Events";
 static constexpr auto fileNameOneBranch = "dataonebranch.root";
 static constexpr auto fileNameTwoBranches = "datatwobranches.root";
 static constexpr auto branchOne = "x";
 static constexpr auto branchTwo = "y";
 static constexpr auto nEntries = 8000;
-static auto pathOneBranch = scratchDir + "/" + fileNameOneBranch;
-static auto pathTwoBranches = scratchDir + "/" + fileNameTwoBranches;
-
-
+static auto pathOneBranch = RB::GetTempFs() + "/" + fileNameOneBranch;
+static auto pathTwoBranches = RB::GetTempFs() + "/" + fileNameTwoBranches;
 
 // an assert implementation that is not no-op for optimized builds
-void ensure(bool b)
+inline void ensure(bool b)
 {
    if (!b)
       std::abort();

root/tree/tree/TTreeBenchmarks.cxx

@@ -1,4 +1,3 @@
-#include "RDataFrameBench.h"
 #include <ROOT/RDataFrame.hxx>
 #include <ROOT/RVec.hxx>
 #include <TFile.h>
@@ -14,6 +13,13 @@
 #include <vector>
 #include <cstring>
 
+#include "rootbench/RBConfig.h"
+
+inline void ensure(bool b)
+{
+   if (!b)
+      std::abort();
+}
 
 using ROOT::RVec;
 
@@ -22,7 +28,7 @@ static constexpr auto fileName = "data.root";
 static constexpr auto scalarBranch = "x";
 static constexpr auto vectorBranch = "vec";
 static constexpr auto nEntries = 100000;
-static const auto pathToFile = scratchDir + "/" + fileName;
+static const auto pathToFile = RB::GetTempFs() + "/" + fileName;
 
 
 void MakeDataIfNeeded()