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
Merge branch 'master' of https://framagit.org/simgrid/simgrid
[simgrid.git]
/
src
/
smpi
/
internals
/
smpi_replay.cpp
diff --git
a/src/smpi/internals/smpi_replay.cpp
b/src/smpi/internals/smpi_replay.cpp
index
b78e173
..
a518706
100644
(file)
--- a/
src/smpi/internals/smpi_replay.cpp
+++ b/
src/smpi/internals/smpi_replay.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009-202
2
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-202
3
. 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. */
@@
-39,7
+39,7
@@
template <class T> inline void hash_combine(std::size_t& seed, T const& v)
}
// Recursive template code derived from Matthieu M.
}
// Recursive template code derived from Matthieu M.
-template <class Tuple, size_t Index = std::tuple_size
<Tuple>::value
- 1> class HashValueImpl {
+template <class Tuple, size_t Index = std::tuple_size
_v<Tuple>
- 1> class HashValueImpl {
public:
static void apply(size_t& seed, Tuple const& tuple)
{
public:
static void apply(size_t& seed, Tuple const& tuple)
{
@@
-117,7
+117,7
@@
public:
{
for (auto const& [_, reqs] : store) {
aid_t my_proc_id = simgrid::s4u::this_actor::get_pid();
{
for (auto const& [_, reqs] : store) {
aid_t my_proc_id = simgrid::s4u::this_actor::get_pid();
- for (
auto& req: reqs)
{
+ for (
const auto& req : reqs)
{
if (req != MPI_REQUEST_NULL && (req->src() == my_proc_id || req->dst() == my_proc_id)) {
vec.push_back(req);
req->print_request("MM");
if (req != MPI_REQUEST_NULL && (req->src() == my_proc_id || req->dst() == my_proc_id)) {
vec.push_back(req);
req->print_request("MM");
@@
-167,7
+167,7
@@
void SendOrRecvParser::parse(simgrid::xbt::ReplayAction& action, const std::stri
CHECK_ACTION_PARAMS(action, 3, 1)
partner = std::stoi(action[2]);
tag = std::stoi(action[3]);
CHECK_ACTION_PARAMS(action, 3, 1)
partner = std::stoi(action[2]);
tag = std::stoi(action[3]);
- size = parse_integer<size_t>(action[4]);
+ size = parse_integer<s
s
ize_t>(action[4]);
datatype1 = parse_datatype(action, 5);
}
datatype1 = parse_datatype(action, 5);
}
@@
-186,7
+186,7
@@
void SleepParser::parse(simgrid::xbt::ReplayAction& action, const std::string&)
void LocationParser::parse(simgrid::xbt::ReplayAction& action, const std::string&)
{
CHECK_ACTION_PARAMS(action, 2, 0)
void LocationParser::parse(simgrid::xbt::ReplayAction& action, const std::string&)
{
CHECK_ACTION_PARAMS(action, 2, 0)
- filename =
std::string(action[2])
;
+ filename =
action[2]
;
line = std::stoi(action[3]);
}
line = std::stoi(action[3]);
}
@@
-486,8
+486,8
@@
void RecvAction::kernel(simgrid::xbt::ReplayAction&)
MPI_Status status;
// unknown size from the receiver point of view
MPI_Status status;
// unknown size from the receiver point of view
- size_t arg_size = args.size;
- if (arg_size
==
0) {
+ s
s
ize_t arg_size = args.size;
+ if (arg_size
<
0) {
Request::probe(args.partner, args.tag, MPI_COMM_WORLD, &status);
arg_size = status.count;
}
Request::probe(args.partner, args.tag, MPI_COMM_WORLD, &status);
arg_size = status.count;
}
@@
-541,7
+541,6
@@
void SendRecvAction::kernel(simgrid::xbt::ReplayAction&)
TRACE_smpi_recv(src_traced, my_proc_id, recvtag);
TRACE_smpi_comm_out(my_proc_id);
XBT_DEBUG("Exits SendRecv");
TRACE_smpi_recv(src_traced, my_proc_id, recvtag);
TRACE_smpi_comm_out(my_proc_id);
XBT_DEBUG("Exits SendRecv");
-
}
void ComputeAction::kernel(simgrid::xbt::ReplayAction&)
}
void ComputeAction::kernel(simgrid::xbt::ReplayAction&)
@@
-565,7
+564,7
@@
void SleepAction::kernel(simgrid::xbt::ReplayAction&)
void LocationAction::kernel(simgrid::xbt::ReplayAction&)
{
const LocationParser& args = get_args();
void LocationAction::kernel(simgrid::xbt::ReplayAction&)
{
const LocationParser& args = get_args();
- smpi_trace_set_call_location(args.filename.c_str(), args.line);
+ smpi_trace_set_call_location(args.filename.c_str(), args.line
, ""
);
}
void TestAction::kernel(simgrid::xbt::ReplayAction&)
}
void TestAction::kernel(simgrid::xbt::ReplayAction&)
@@
-921,7
+920,7
@@
void smpi_replay_main(int rank, const char* private_trace_filename)
unsigned int i=0;
for (auto const& [_, reqs] : storage[simgrid::s4u::this_actor::get_pid()].get_store()) {
unsigned int i=0;
for (auto const& [_, reqs] : storage[simgrid::s4u::this_actor::get_pid()].get_store()) {
- for (auto& req : reqs) {
+ for (
const
auto& req : reqs) {
requests[i] = req; // FIXME: overwritten at each iteration?
}
i++;
requests[i] = req; // FIXME: overwritten at each iteration?
}
i++;
@@
-929,7
+928,7
@@
void smpi_replay_main(int rank, const char* private_trace_filename)
simgrid::smpi::Request::waitall(count_requests, requests.data(), MPI_STATUSES_IGNORE);
}
simgrid::smpi::Request::waitall(count_requests, requests.data(), MPI_STATUSES_IGNORE);
}
- if
(simgrid::config::get_value<bool>("smpi/finalization-barrier
"))
+ if
(simgrid::config::get_value<bool>("smpi/barrier-finalization
"))
simgrid::smpi::colls::barrier(MPI_COMM_WORLD);
active_processes--;
simgrid::smpi::colls::barrier(MPI_COMM_WORLD);
active_processes--;