A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added circle placement for ns3 wifi nodes
[simgrid.git]
/
include
/
xbt
/
replay.hpp
diff --git
a/include/xbt/replay.hpp
b/include/xbt/replay.hpp
index be41b1c99acc26e5fdba19c9a5952e8d449472a1..bb8c27e59999d7ba6a50459f0e699c813d2432de 100644
(file)
--- a/
include/xbt/replay.hpp
+++ b/
include/xbt/replay.hpp
@@
-1,7
+1,6
@@
/* xbt/replay_reader.h -- Tools to parse a replay file */
/* xbt/replay_reader.h -- Tools to parse a replay file */
-/* Copyright (c) 2010, 2012-2015, 2017. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2010-2020. 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. */
/* 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. */
@@
-9,9
+8,10
@@
#ifndef XBT_REPLAY_HPP
#define XBT_REPLAY_HPP
#ifndef XBT_REPLAY_HPP
#define XBT_REPLAY_HPP
-#include
"xbt/dict.h"
-#ifdef __cplusplus
+#include
<xbt/misc.h> /* SG_BEGIN_DECL */
+
#include <fstream>
#include <fstream>
+#include <functional>
#include <queue>
#include <unordered_map>
#include <queue>
#include <unordered_map>
@@
-19,19
+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;
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_DATA
std::ifstream*
action_fs;
+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);
-SG_END_DECL()
+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);
#endif
#endif