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
Also simplify the API of Engine::getLinkList
[simgrid.git]
/
src
/
surf
/
network_smpi.cpp
diff --git
a/src/surf/network_smpi.cpp
b/src/surf/network_smpi.cpp
index
8452508
..
47b0d16
100644
(file)
--- a/
src/surf/network_smpi.cpp
+++ b/
src/surf/network_smpi.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2013-201
5
. The SimGrid Team.
+/* Copyright (c) 2013-201
7
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-11,7
+11,7
@@
#include "network_smpi.hpp"
#include "simgrid/sg_config.h"
#include "network_smpi.hpp"
#include "simgrid/sg_config.h"
-#include "smpi
/smpi
_utils.hpp"
+#include "smpi_utils.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
@@
-40,7
+40,6
@@
void surf_network_model_init_SMPI()
surf_network_model = new simgrid::surf::NetworkSmpiModel();
all_existing_models->push_back(surf_network_model);
surf_network_model = new simgrid::surf::NetworkSmpiModel();
all_existing_models->push_back(surf_network_model);
- xbt_cfg_setdefault_double("network/sender-gap", 10e-6);
xbt_cfg_setdefault_double("network/weight-S", 8775);
}
xbt_cfg_setdefault_double("network/weight-S", 8775);
}
@@
-49,7
+48,6
@@
namespace surf {
NetworkSmpiModel::NetworkSmpiModel() : NetworkCm02Model()
{
NetworkSmpiModel::NetworkSmpiModel() : NetworkCm02Model()
{
- haveGap_ = true;
}
NetworkSmpiModel::~NetworkSmpiModel() = default;
}
NetworkSmpiModel::~NetworkSmpiModel() = default;
@@
-60,7
+58,7
@@
double NetworkSmpiModel::bandwidthFactor(double size)
smpi_bw_factor = parse_factor(xbt_cfg_get_string("smpi/bw-factor"));
double current = 1.0;
smpi_bw_factor = parse_factor(xbt_cfg_get_string("smpi/bw-factor"));
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;
@@
-78,7
+76,7
@@
double NetworkSmpiModel::latencyFactor(double size)
smpi_lat_factor = parse_factor(xbt_cfg_get_string("smpi/lat-factor"));
double current = 1.0;
smpi_lat_factor = parse_factor(xbt_cfg_get_string("smpi/lat-factor"));
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;