start snake_casing s4u::Engine

[simgrid.git] / examples / s4u / replay-storage / s4u-replay-storage.cpp

diff --git a/examples/s4u/replay-storage/s4u-replay-storage.cpp b/examples/s4u/replay-storage/s4u-replay-storage.cpp
index 8d84d0a..f1a76f2 100644 (file)
--- a/examples/s4u/replay-storage/s4u-replay-storage.cpp
+++ b/examples/s4u/replay-storage/s4u-replay-storage.cpp
@@ -1,39 +1,37 @@
-/* Copyright (c) 2017. The SimGrid Team. All rights reserved.               */
+/* Copyright (c) 2017-2018. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "simgrid/s4u.hpp"
-#include "src/plugins/file_system/FileSystem.hpp"
-#include <boost/algorithm/string/join.hpp>
 #include <simgrid/plugins/file_system.h>
+#include <simgrid/s4u.hpp>
 #include <xbt/replay.hpp>
 #include <xbt/str.h>
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(storage_replay, "Messages specific for this example");
+#include <boost/algorithm/string/join.hpp>
+
+XBT_LOG_NEW_DEFAULT_CATEGORY(replay_storage, "Messages specific for this example");
 
 static std::unordered_map<std::string, simgrid::s4u::File*> opened_files;
 
 #define ACT_DEBUG(...)                                                                                                 \
-  if (XBT_LOG_ISENABLED(storage_replay, xbt_log_priority_verbose)) {                                                   \
-    char* NAME = xbt_str_join_array(action, " ");                                                                      \
+  if (XBT_LOG_ISENABLED(replay_storage, xbt_log_priority_verbose)) {                                                   \
+    std::string NAME = boost::algorithm::join(action, " ");                                                            \
     XBT_DEBUG(__VA_ARGS__);                                                                                            \
-    xbt_free(NAME);                                                                                                    \
   } else                                                                                                               \
   ((void)0)
 
-static void log_action(const char* const* action, double date)
+static void log_action(simgrid::xbt::ReplayAction& action, double date)
 {
-  if (XBT_LOG_ISENABLED(storage_replay, xbt_log_priority_verbose)) {
-    char* name = xbt_str_join_array(action, " ");
-    XBT_VERB("%s %f", name, date);
-    xbt_free(name);
+  if (XBT_LOG_ISENABLED(replay_storage, xbt_log_priority_verbose)) {
+    std::string s = boost::algorithm::join(action, " ");
+    XBT_VERB("%s %f", s.c_str(), date);
   }
 }
 
 static simgrid::s4u::File* get_file_descriptor(std::string file_name)
 {
-  std::string full_name = simgrid::s4u::this_actor::getName() + ":" + file_name;
+  std::string full_name = simgrid::s4u::this_actor::get_name() + ":" + file_name;
 
   return opened_files.at(full_name);
 }
@@ -60,13 +58,13 @@ public:
   }
 
   /* My actions */
-  static void open(const char* const* action)
+  static void open(simgrid::xbt::ReplayAction& action)
   {
     std::string file_name = action[2];
     double clock          = simgrid::s4u::Engine::getClock();
-    std::string full_name = simgrid::s4u::this_actor::getName() + ":" + file_name;
+    std::string full_name = simgrid::s4u::this_actor::get_name() + ":" + file_name;
 
-    ACT_DEBUG("Entering Open: %s (filename: %s)", NAME, file_name.c_str());
+    ACT_DEBUG("Entering Open: %s (filename: %s)", NAME.c_str(), file_name.c_str());
     simgrid::s4u::File* file = new simgrid::s4u::File(file_name, NULL);
 
     opened_files.insert({full_name, file});
@@ -74,7 +72,7 @@ public:
     log_action(action, simgrid::s4u::Engine::getClock() - clock);
   }
 
-  static void read(const char* const* action)
+  static void read(simgrid::xbt::ReplayAction& action)
   {
     std::string file_name = action[2];
     sg_size_t size        = std::stoul(action[3]);
@@ -82,20 +80,20 @@ public:
 
     simgrid::s4u::File* file = get_file_descriptor(file_name);
 
-    ACT_DEBUG("Entering Read: %s (size: %llu)", NAME, size);
+    ACT_DEBUG("Entering Read: %s (size: %llu)", NAME.c_str(), size);
     file->read(size);
 
     log_action(action, simgrid::s4u::Engine::getClock() - clock);
   }
 
-  static void close(const char* const* action)
+  static void close(simgrid::xbt::ReplayAction& action)
   {
     std::string file_name = action[2];
     double clock          = simgrid::s4u::Engine::getClock();
 
     simgrid::s4u::File* file = get_file_descriptor(file_name);
 
-    ACT_DEBUG("Entering Close: %s (filename: %s)", NAME, file_name.c_str());
+    ACT_DEBUG("Entering Close: %s (filename: %s)", NAME.c_str(), file_name.c_str());
     delete file;
 
     log_action(action, simgrid::s4u::Engine::getClock() - clock);
@@ -113,10 +111,10 @@ int main(int argc, char* argv[])
                        "\texample: %s platform.xml deployment.xml",
              argv[0], argv[0], argv[0]);
 
-  e.loadPlatform(argv[1]);
-  e.registerDefault(&simgrid::xbt::replay_runner);
+  e.load_platform(argv[1]);
+  e.register_default(&simgrid::xbt::replay_runner);
   e.registerFunction<Replayer>("p0");
-  e.loadDeployment(argv[2]);
+  e.load_deployment(argv[2]);
 
   /*   Action registration */
   xbt_replay_action_register("open", Replayer::open);