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
Revise to fool cppcheck.
[simgrid.git]
/
src
/
xbt
/
xbt_replay.cpp
diff --git
a/src/xbt/xbt_replay.cpp
b/src/xbt/xbt_replay.cpp
index
e782ab2
..
7af9758
100644
(file)
--- a/
src/xbt/xbt_replay.cpp
+++ b/
src/xbt/xbt_replay.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2010-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-201
9
. 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. */
@@
-18,32
+18,27
@@
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;
std::unordered_map<std::string, action_fun> action_funs;
static std::unordered_map<std::string, std::queue<ReplayAction*>*> action_queues;
-static void read_and_trim_line(std::ifstream
*
fs, std::string* line)
+static void read_and_trim_line(std::ifstream
&
fs, std::string* line)
{
do {
{
do {
- std::getline(
*
fs, *line);
+ std::getline(fs, *line);
boost::trim(*line);
boost::trim(*line);
- } while (not fs
->
eof() && (line->length() == 0 || line->front() == '#'));
+ } while (not fs
.
eof() && (line->length() == 0 || line->front() == '#'));
XBT_DEBUG("got from trace: %s", line->c_str());
}
class ReplayReader {
XBT_DEBUG("got from trace: %s", line->c_str());
}
class ReplayReader {
- std::ifstream
*
fs;
+ std::ifstream fs;
std::string line;
public:
std::string line;
public:
- explicit ReplayReader(const char* filename)
+ explicit ReplayReader(const char* filename)
: fs(filename, std::ifstream::in)
{
XBT_VERB("Prepare to replay file '%s'", filename);
{
XBT_VERB("Prepare to replay file '%s'", filename);
- fs = new std::ifstream(filename, std::ifstream::in);
- xbt_assert(fs->is_open(), "Cannot read replay file '%s'", filename);
+ xbt_assert(fs.is_open(), "Cannot read replay file '%s'", filename);
}
ReplayReader(const ReplayReader&) = delete;
ReplayReader& operator=(const ReplayReader&) = delete;
}
ReplayReader(const ReplayReader&) = delete;
ReplayReader& operator=(const ReplayReader&) = delete;
- ~ReplayReader()
- {
- delete fs;
- }
bool get(ReplayAction* action);
};
bool get(ReplayAction* action);
};
@@
-52,7
+47,7
@@
bool ReplayReader::get(ReplayAction* action)
read_and_trim_line(fs, &line);
boost::split(*action, line, boost::is_any_of(" \t"), boost::token_compress_on);
read_and_trim_line(fs, &line);
boost::split(*action, line, boost::is_any_of(" \t"), boost::token_compress_on);
- return not fs
->
eof();
+ return not fs
.
eof();
}
static ReplayAction* get_action(const char* name)
}
static ReplayAction* get_action(const char* name)
@@
-66,7
+61,7
@@
static ReplayAction* get_action(const char* name)
// Read lines until I reach something for me (which breaks in loop body) or end of file reached
while (true) {
std::string action_line;
// Read lines until I reach something for me (which breaks in loop body) or end of file reached
while (true) {
std::string action_line;
- read_and_trim_line(action_fs, &action_line);
+ read_and_trim_line(
*
action_fs, &action_line);
if (action_fs->eof())
break;
/* we cannot split in place here because we parse&store several lines for the colleagues... */
if (action_fs->eof())
break;
/* we cannot split in place here because we parse&store several lines for the colleagues... */
@@
-163,7
+158,7
@@
int replay_runner(const char* actor_name, const char* trace_filename)
* @param action_name the reference name of the action.
* @param function prototype given by the type: void...(const char** action)
*/
* @param action_name the reference name of the action.
* @param function prototype given by the type: void...(const char** action)
*/
-void xbt_replay_action_register(const char* action_name,
action_fun
function)
+void xbt_replay_action_register(const char* action_name,
const action_fun&
function)
{
simgrid::xbt::action_funs[std::string(action_name)] = function;
}
{
simgrid::xbt::action_funs[std::string(action_name)] = function;
}