-/* 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. */
-#include <cstddef>
-#include <algorithm>
-
-#include <xbt/log.h>
-
#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);
std::vector<s_smpi_factor_t> smpi_bw_factor;
std::vector<s_smpi_factor_t> smpi_lat_factor;
-xbt_dict_t gap_lookup = nullptr;
-
/*********
* Model *
*********/
{
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 surf {
-
- NetworkSmpiModel::NetworkSmpiModel() : NetworkCm02Model()
- {
- haveGap_ = true;
- }
-
- NetworkSmpiModel::~NetworkSmpiModel()
- {
- xbt_dict_free(&gap_lookup);
- }
-
- double NetworkSmpiModel::bandwidthFactor(double size)
- {
- if (smpi_bw_factor.empty())
- smpi_bw_factor = parse_factor(xbt_cfg_get_string("smpi/bw-factor"));
-
- double current = 1.0;
- for (const auto& fact : smpi_bw_factor) {
- if (size <= fact.factor) {
- XBT_DEBUG("%f <= %zu return %f", size, fact.factor, current);
- return current;
- } else
- current = fact.values.front();
- }
- XBT_DEBUG("%f > %zu return %f", size, smpi_bw_factor.back().factor, current);
+namespace kernel {
+namespace resource {
- return current;
- }
-
- double NetworkSmpiModel::latencyFactor(double size)
- {
- if (smpi_lat_factor.empty())
- smpi_lat_factor = parse_factor(xbt_cfg_get_string("smpi/lat-factor"));
-
- double current=1.0;
- for (const auto& fact : smpi_lat_factor) {
- if (size <= fact.factor) {
- XBT_DEBUG("%f <= %zu return %f", size, fact.factor, current);
- return current;
- }else
- current=fact.values.front();
- }
- XBT_DEBUG("%f > %zu return %f", size, smpi_lat_factor.back().factor, current);
+NetworkSmpiModel::NetworkSmpiModel() : NetworkCm02Model()
+{
+ /* Do not add this into all_existing_models: our ancestor already does so */
+}
- return current;
- }
+double NetworkSmpiModel::get_bandwidth_factor(double size)
+{
+ if (smpi_bw_factor.empty())
+ smpi_bw_factor = parse_factor(config::get_value<std::string>("smpi/bw-factor"));
- double NetworkSmpiModel::bandwidthConstraint(double rate, double bound, double size)
- {
- return rate < 0 ? bound : std::min(bound, rate * bandwidthFactor(size));
- }
+ double current = 1.0;
+ for (auto const& fact : smpi_bw_factor) {
+ if (size <= fact.factor) {
+ XBT_DEBUG("%f <= %zu return %f", size, fact.factor, current);
+ return current;
+ } else
+ current = fact.values.front();
+ }
+ XBT_DEBUG("%f > %zu return %f", size, smpi_bw_factor.back().factor, current);
- /************
- * Resource *
- ************/
+ return current;
+}
+double NetworkSmpiModel::get_latency_factor(double size)
+{
+ if (smpi_lat_factor.empty())
+ smpi_lat_factor = parse_factor(config::get_value<std::string>("smpi/lat-factor"));
+ double current = 1.0;
+ for (auto const& fact : smpi_lat_factor) {
+ if (size <= fact.factor) {
+ XBT_DEBUG("%f <= %zu return %f", size, fact.factor, current);
+ return current;
+ } else
+ current = fact.values.front();
+ }
+ XBT_DEBUG("%f > %zu return %f", size, smpi_lat_factor.back().factor, current);
- /**********
- * Action *
- **********/
+ return current;
+}
- }
+double NetworkSmpiModel::get_bandwidth_constraint(double rate, double bound, double size)
+{
+ return rate < 0 ? bound : std::min(bound, rate * get_bandwidth_factor(size));
}
+} // namespace resource
+} // namespace kernel
+} // namespace simgrid