X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bd7d5780ee8b73efd58c83f5d6f864d0a941b3ed..4d648ebbbe5705878080b9cbf1ca61497323c592:/include/xbt/replay.hpp

diff --git a/include/xbt/replay.hpp b/include/xbt/replay.hpp
index de1fbc53b2..f612332d78 100644
--- a/include/xbt/replay.hpp
+++ b/include/xbt/replay.hpp
@@ -1,6 +1,6 @@
 /* xbt/replay_reader.h -- Tools to parse a replay file                */
 
-/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2019. 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. */
@@ -10,8 +10,8 @@
 
 #include <xbt/misc.h> /* SG_BEGIN_DECL */
 
-#ifdef __cplusplus
 #include <fstream>
+#include <functional>
 #include <queue>
 #include <unordered_map>
 
@@ -19,20 +19,14 @@ namespace simgrid {
 namespace xbt {
 /* To split the file if a unique one is given (specific variable for the other case live in runner()) */
 typedef std::vector<std::string> ReplayAction;
-static std::unordered_map<std::string, std::queue<ReplayAction*>*> action_queues;
 
 XBT_PUBLIC_DATA std::ifstream* action_fs;
-XBT_PUBLIC int replay_runner(int argc, char* argv[]);
+XBT_PUBLIC int replay_runner(const char* actor_name, const char* trace_filename);
 }
 }
-#endif
-
-SG_BEGIN_DECL()
 
-typedef void (*action_fun)(const char* const* args);
-XBT_PUBLIC void xbt_replay_action_register(const char* action_name, action_fun function);
+typedef std::function<void(simgrid::xbt::ReplayAction&)> action_fun;
+XBT_PUBLIC void xbt_replay_action_register(const char* action_name, const action_fun& function);
 XBT_PUBLIC action_fun xbt_replay_action_get(const char* action_name);
 
-SG_END_DECL()
-
 #endif