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 framagit.org:simgrid/simgrid
[simgrid.git]
/
src
/
smpi
/
internals
/
smpi_host.cpp
diff --git
a/src/smpi/internals/smpi_host.cpp
b/src/smpi/internals/smpi_host.cpp
index
0f1cb3e
..
d8daf0d
100644
(file)
--- a/
src/smpi/internals/smpi_host.cpp
+++ b/
src/smpi/internals/smpi_host.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2017-202
1
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2017-202
2
. 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. */
@@
-29,16
+29,14
@@
void smpi_cleanup_op_cost_callback()
cost_cbs.clear();
}
cost_cbs.clear();
}
-namespace simgrid {
-namespace smpi {
+namespace simgrid::smpi {
xbt::Extension<s4u::Host, smpi::Host> Host::EXTENSION_ID;
double Host::orecv(size_t size, s4u::Host* src, s4u::Host* dst)
{
/* return user's callback if available */
xbt::Extension<s4u::Host, smpi::Host> Host::EXTENSION_ID;
double Host::orecv(size_t size, s4u::Host* src, s4u::Host* dst)
{
/* return user's callback if available */
- auto it = cost_cbs.find(SmpiOperation::RECV);
- if (it != cost_cbs.end())
+ if (auto it = cost_cbs.find(SmpiOperation::RECV); it != cost_cbs.end())
return it->second(size, src, dst);
/* fallback to smpi/or config */
return it->second(size, src, dst);
/* fallback to smpi/or config */
@@
-66,8
+64,7
@@
double Host::orecv(size_t size, s4u::Host* src, s4u::Host* dst)
double Host::osend(size_t size, s4u::Host* src, s4u::Host* dst)
{
/* return user's callback if available */
double Host::osend(size_t size, s4u::Host* src, s4u::Host* dst)
{
/* return user's callback if available */
- auto it = cost_cbs.find(SmpiOperation::SEND);
- if (it != cost_cbs.end())
+ if (auto it = cost_cbs.find(SmpiOperation::SEND); it != cost_cbs.end())
return it->second(size, src, dst);
/* fallback to smpi/os config */
return it->second(size, src, dst);
/* fallback to smpi/os config */
@@
-94,8
+91,7
@@
double Host::osend(size_t size, s4u::Host* src, s4u::Host* dst)
double Host::oisend(size_t size, s4u::Host* src, s4u::Host* dst)
{
/* return user's callback if available */
double Host::oisend(size_t size, s4u::Host* src, s4u::Host* dst)
{
/* return user's callback if available */
- auto it = cost_cbs.find(SmpiOperation::ISEND);
- if (it != cost_cbs.end())
+ if (auto it = cost_cbs.find(SmpiOperation::ISEND); it != cost_cbs.end())
return it->second(size, src, dst);
/* fallback to smpi/ois config */
return it->second(size, src, dst);
/* fallback to smpi/ois config */
@@
-120,7
+116,7
@@
double Host::oisend(size_t size, s4u::Host* src, s4u::Host* dst)
return current;
}
return current;
}
-void Host::check_factor_configs(const std::string op) const
+void Host::check_factor_configs(const std::string
&
op) const
{
static const std::unordered_map<std::string, SmpiOperation> name_to_op_enum{
{"smpi/or", SmpiOperation::RECV}, {"smpi/os", SmpiOperation::SEND}, {"smpi/ois", SmpiOperation::ISEND}};
{
static const std::unordered_map<std::string, SmpiOperation> name_to_op_enum{
{"smpi/or", SmpiOperation::RECV}, {"smpi/os", SmpiOperation::SEND}, {"smpi/ois", SmpiOperation::ISEND}};
@@
-137,29
+133,25
@@
Host::Host(s4u::Host* ptr) : host(ptr)
smpi::Host::EXTENSION_ID = s4u::Host::extension_create<Host>();
check_factor_configs("smpi/or");
smpi::Host::EXTENSION_ID = s4u::Host::extension_create<Host>();
check_factor_configs("smpi/or");
- const char* orecv_string = host->get_property("smpi/or");
- if (orecv_string != nullptr) {
+ if (const char* orecv_string = host->get_property("smpi/or")) {
orecv_parsed_values = simgrid::smpi::utils::parse_factor(orecv_string);
} else {
orecv_parsed_values = simgrid::smpi::utils::parse_factor(config::get_value<std::string>("smpi/or"));
}
check_factor_configs("smpi/os");
orecv_parsed_values = simgrid::smpi::utils::parse_factor(orecv_string);
} else {
orecv_parsed_values = simgrid::smpi::utils::parse_factor(config::get_value<std::string>("smpi/or"));
}
check_factor_configs("smpi/os");
- const char* osend_string = host->get_property("smpi/os");
- if (osend_string != nullptr) {
+ if (const char* osend_string = host->get_property("smpi/os")) {
osend_parsed_values = simgrid::smpi::utils::parse_factor(osend_string);
} else {
osend_parsed_values = simgrid::smpi::utils::parse_factor(config::get_value<std::string>("smpi/os"));
}
check_factor_configs("smpi/ois");
osend_parsed_values = simgrid::smpi::utils::parse_factor(osend_string);
} else {
osend_parsed_values = simgrid::smpi::utils::parse_factor(config::get_value<std::string>("smpi/os"));
}
check_factor_configs("smpi/ois");
- const char* oisend_string = host->get_property("smpi/ois");
- if (oisend_string != nullptr) {
+ if (const char* oisend_string = host->get_property("smpi/ois")) {
oisend_parsed_values = simgrid::smpi::utils::parse_factor(oisend_string);
} else {
oisend_parsed_values = simgrid::smpi::utils::parse_factor(config::get_value<std::string>("smpi/ois"));
}
}
oisend_parsed_values = simgrid::smpi::utils::parse_factor(oisend_string);
} else {
oisend_parsed_values = simgrid::smpi::utils::parse_factor(config::get_value<std::string>("smpi/ois"));
}
}
-} // namespace smpi
-} // namespace simgrid
+} // namespace simgrid::smpi