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
Kill a file that was almost empty
[simgrid.git]
/
src
/
mc
/
mc_record.cpp
diff --git
a/src/mc/mc_record.cpp
b/src/mc/mc_record.cpp
index
e266adf
..
6ff4d15
100644
(file)
--- a/
src/mc/mc_record.cpp
+++ b/
src/mc/mc_record.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2014-202
0
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2014-202
1
. 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. */
@@
-7,14
+7,12
@@
#include "src/kernel/activity/CommImpl.hpp"
#include "src/kernel/context/Context.hpp"
#include "src/mc/Transition.hpp"
#include "src/kernel/activity/CommImpl.hpp"
#include "src/kernel/context/Context.hpp"
#include "src/mc/Transition.hpp"
-#include "src/mc/mc_base.h"
+#include "src/mc/mc_base.h
pp
"
#include "src/mc/mc_replay.hpp"
#if SIMGRID_HAVE_MC
#include "src/mc/checker/Checker.hpp"
#include "src/mc/mc_private.hpp"
#include "src/mc/mc_replay.hpp"
#if SIMGRID_HAVE_MC
#include "src/mc/checker/Checker.hpp"
#include "src/mc/mc_private.hpp"
-#include "src/mc/mc_request.hpp"
-#include "src/mc/mc_smx.hpp"
#include "src/mc/mc_state.hpp"
#endif
#include "src/mc/mc_state.hpp"
#endif
@@
-28,7
+26,7
@@
void replay(RecordTrace const& trace)
simgrid::mc::wait_for_requests();
for (simgrid::mc::Transition const& transition : trace) {
simgrid::mc::wait_for_requests();
for (simgrid::mc::Transition const& transition : trace) {
- XBT_DEBUG("Executing %i$%i", transition.pid_, transition.
argument
_);
+ XBT_DEBUG("Executing %i$%i", transition.pid_, transition.
times_considered
_);
// Choose a request:
kernel::actor::ActorImpl* actor = kernel::actor::ActorImpl::by_PID(transition.pid_);
// Choose a request:
kernel::actor::ActorImpl* actor = kernel::actor::ActorImpl::by_PID(transition.pid_);
@@
-41,7
+39,7
@@
void replay(RecordTrace const& trace)
xbt_die("Unexpected simcall.");
// Execute the request:
xbt_die("Unexpected simcall.");
// Execute the request:
- simcall->issuer_->simcall_handle(transition.
argument
_);
+ simcall->issuer_->simcall_handle(transition.
times_considered
_);
simgrid::mc::wait_for_requests();
}
}
simgrid::mc::wait_for_requests();
}
}
@@
-64,7
+62,7
@@
RecordTrace parseRecordTrace(const char* data)
const char* current = data;
while (*current) {
simgrid::mc::Transition item;
const char* current = data;
while (*current) {
simgrid::mc::Transition item;
- int count = sscanf(current, "%d/%d", &item.pid_, &item.
argument
_);
+ int count = sscanf(current, "%d/%d", &item.pid_, &item.
times_considered
_);
if(count != 2 && count != 1)
throw std::invalid_argument("Could not parse record path");
if(count != 2 && count != 1)
throw std::invalid_argument("Could not parse record path");
@@
-90,8
+88,8
@@
std::string traceToString(simgrid::mc::RecordTrace const& trace)
if (i != trace.begin())
stream << ';';
stream << i->pid_;
if (i != trace.begin())
stream << ';';
stream << i->pid_;
- if (i->
argument
_)
- stream << '/' << i->
argument
_;
+ if (i->
times_considered
_)
+ stream << '/' << i->
times_considered
_;
}
return stream.str();
}
}
return stream.str();
}