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
Cosmetics (and please scan-build about potential null surf_action_).
[simgrid.git]
/
src
/
surf
/
network_smpi.cpp
diff --git
a/src/surf/network_smpi.cpp
b/src/surf/network_smpi.cpp
index
8452508
..
9a14001
100644
(file)
--- a/
src/surf/network_smpi.cpp
+++ b/
src/surf/network_smpi.cpp
@@
-1,17
+1,13
@@
-/* Copyright (c) 2013-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2013-2019. 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. */
-#include <cstddef>
-#include <algorithm>
-
-#include <xbt/log.h>
-
#include "network_smpi.hpp"
#include "network_smpi.hpp"
-#include "simgrid/sg_config.h"
-#include "smpi/smpi_utils.hpp"
+#include "simgrid/sg_config.hpp"
+#include "smpi_utils.hpp"
+#include "src/surf/surf_interface.hpp"
+#include "surf/surf.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
@@
-37,30
+33,29
@@
void surf_network_model_init_SMPI()
{
if (surf_network_model)
return;
{
if (surf_network_model)
return;
- surf_network_model = new simgrid::surf::NetworkSmpiModel();
- all_existing_models->push_back(surf_network_model);
+ surf_network_model = new simgrid::kernel::resource::NetworkSmpiModel();
- xbt_cfg_setdefault_double("network/sender-gap", 10e-6);
- xbt_cfg_setdefault_double("network/weight-S", 8775);
+ simgrid::config::set_default<double>("network/weight-S", 8775);
}
namespace simgrid {
}
namespace simgrid {
-namespace surf {
+namespace kernel {
+namespace resource {
NetworkSmpiModel::NetworkSmpiModel() : NetworkCm02Model()
{
NetworkSmpiModel::NetworkSmpiModel() : NetworkCm02Model()
{
- haveGap_ = true;
+ /* Do not add this into all_existing_models: our ancestor already does so */
}
NetworkSmpiModel::~NetworkSmpiModel() = default;
}
NetworkSmpiModel::~NetworkSmpiModel() = default;
-double NetworkSmpiModel::
bandwidthF
actor(double size)
+double NetworkSmpiModel::
get_bandwidth_f
actor(double size)
{
if (smpi_bw_factor.empty())
{
if (smpi_bw_factor.empty())
- smpi_bw_factor = parse_factor(
xbt_cfg_get_string
("smpi/bw-factor"));
+ smpi_bw_factor = parse_factor(
simgrid::config::get_value<std::string>
("smpi/bw-factor"));
double current = 1.0;
double current = 1.0;
- for (
const auto
& fact : smpi_bw_factor) {
+ for (
auto const
& fact : smpi_bw_factor) {
if (size <= fact.factor) {
XBT_DEBUG("%f <= %zu return %f", size, fact.factor, current);
return current;
if (size <= fact.factor) {
XBT_DEBUG("%f <= %zu return %f", size, fact.factor, current);
return current;
@@
-72,13
+67,13
@@
double NetworkSmpiModel::bandwidthFactor(double size)
return current;
}
return current;
}
-double NetworkSmpiModel::
latencyF
actor(double size)
+double NetworkSmpiModel::
get_latency_f
actor(double size)
{
if (smpi_lat_factor.empty())
{
if (smpi_lat_factor.empty())
- smpi_lat_factor = parse_factor(
xbt_cfg_get_string
("smpi/lat-factor"));
+ smpi_lat_factor = parse_factor(
simgrid::config::get_value<std::string>
("smpi/lat-factor"));
double current = 1.0;
double current = 1.0;
- for (
const auto
& fact : smpi_lat_factor) {
+ for (
auto const
& fact : smpi_lat_factor) {
if (size <= fact.factor) {
XBT_DEBUG("%f <= %zu return %f", size, fact.factor, current);
return current;
if (size <= fact.factor) {
XBT_DEBUG("%f <= %zu return %f", size, fact.factor, current);
return current;
@@
-90,9
+85,9
@@
double NetworkSmpiModel::latencyFactor(double size)
return current;
}
return current;
}
-double NetworkSmpiModel::
bandwidthC
onstraint(double rate, double bound, double size)
+double NetworkSmpiModel::
get_bandwidth_c
onstraint(double rate, double bound, double size)
{
{
- return rate < 0 ? bound : std::min(bound, rate *
bandwidthF
actor(size));
+ return rate < 0 ? bound : std::min(bound, rate *
get_bandwidth_f
actor(size));
}
/************
}
/************
@@
-104,3
+99,4
@@
double NetworkSmpiModel::bandwidthConstraint(double rate, double bound, double s
**********/
}
}
**********/
}
}
+} // namespace simgrid