From cb0572c871501a8dab8e7ad5a833bb372b743d01 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Mon, 23 Nov 2020 12:00:22 +0100
Subject: [PATCH] Make simgrid::xbt::action_fs a std::unique_ptr.

---
 examples/s4u/replay-comm/s4u-replay-comm.cpp | 8 ++------
 examples/s4u/replay-io/s4u-replay-io.cpp     | 7 +------
 include/xbt/replay.hpp                       | 3 ++-
 src/xbt/xbt_replay.cpp                       | 2 +-
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/examples/s4u/replay-comm/s4u-replay-comm.cpp b/examples/s4u/replay-comm/s4u-replay-comm.cpp
index 5d3a4305e9..cb33f3f46b 100644
--- a/examples/s4u/replay-comm/s4u-replay-comm.cpp
+++ b/examples/s4u/replay-comm/s4u-replay-comm.cpp
@@ -8,6 +8,7 @@
 #include "xbt/str.h"
 #include <boost/algorithm/string/join.hpp>
 #include <cinttypes>
+#include <memory>
 #include <string>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(replay_comm, "Messages specific for this msg example");
@@ -101,16 +102,11 @@ int main(int argc, char* argv[])
   xbt_replay_action_register("recv", Replayer::recv);
 
   if (argv[3]) {
-    simgrid::xbt::action_fs = new std::ifstream(argv[3], std::ifstream::in);
+    simgrid::xbt::action_fs = std::make_unique<std::ifstream>(argv[3], std::ifstream::in);
   }
 
   e.run();
 
-  if (argv[3]) {
-    delete simgrid::xbt::action_fs;
-    simgrid::xbt::action_fs = nullptr;
-  }
-
   XBT_INFO("Simulation time %g", e.get_clock());
 
   return 0;
diff --git a/examples/s4u/replay-io/s4u-replay-io.cpp b/examples/s4u/replay-io/s4u-replay-io.cpp
index c5fb26b016..70327db92f 100644
--- a/examples/s4u/replay-io/s4u-replay-io.cpp
+++ b/examples/s4u/replay-io/s4u-replay-io.cpp
@@ -115,16 +115,11 @@ int main(int argc, char* argv[])
   xbt_replay_action_register("close", Replayer::close);
 
   if (argv[3]) {
-    simgrid::xbt::action_fs = new std::ifstream(argv[3], std::ifstream::in);
+    simgrid::xbt::action_fs = std::make_unique<std::ifstream>(argv[3], std::ifstream::in);
   }
 
   e.run();
 
-  if (argv[3]) {
-    delete simgrid::xbt::action_fs;
-    simgrid::xbt::action_fs = nullptr;
-  }
-
   XBT_INFO("Simulation time %g", e.get_clock());
 
   return 0;
diff --git a/include/xbt/replay.hpp b/include/xbt/replay.hpp
index d1596e5a5f..94ce2e061a 100644
--- a/include/xbt/replay.hpp
+++ b/include/xbt/replay.hpp
@@ -12,6 +12,7 @@
 
 #include <fstream>
 #include <functional>
+#include <memory>
 #include <queue>
 #include <unordered_map>
 
@@ -20,7 +21,7 @@ namespace xbt {
 /* To split the file if a unique one is given (specific variable for the other case live in runner()) */
 using ReplayAction = std::vector<std::string>;
 
-XBT_PUBLIC_DATA std::ifstream* action_fs;
+XBT_PUBLIC_DATA std::unique_ptr<std::ifstream> action_fs;
 XBT_PUBLIC int replay_runner(const char* actor_name, const char* trace_filename);
 }
 }
diff --git a/src/xbt/xbt_replay.cpp b/src/xbt/xbt_replay.cpp
index c75acf1028..254de60657 100644
--- a/src/xbt/xbt_replay.cpp
+++ b/src/xbt/xbt_replay.cpp
@@ -14,7 +14,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(replay,xbt,"Replay trace reader");
 namespace simgrid {
 namespace xbt {
 
-std::ifstream* action_fs = nullptr;
+std::unique_ptr<std::ifstream> action_fs = nullptr;
 std::unordered_map<std::string, action_fun> action_funs;
 static std::unordered_map<std::string, std::queue<ReplayAction*>*> action_queues;
 
-- 
2.20.1