From 0c675d990c2f0c5060cf49c746a83db99949ef2c Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 3 Aug 2017 22:46:05 +0200 Subject: [PATCH] Remove unused option: network/sender-gap. --- ChangeLog | 3 +++ doc/doxygen/options.doc | 10 ---------- src/include/surf/surf.h | 1 - src/simgrid/sg_config.cpp | 5 ----- src/surf/network_cm02.cpp | 1 - src/surf/network_smpi.cpp | 1 - src/surf/surf_interface.hpp | 6 +----- 7 files changed, 4 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9f70fdbcc1..798898b97a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,9 @@ SimGrid (3.17) UNRELEASED (release target: September 22 2017) - Comm.detach(): start and forget about asynchronous emission - this_actor::send(mailbox) is now mailbox->put() + SURF + - Unused option network/sender-gap is removed. + SimGrid (3.16) Released June 22. 2017. The Blooming Spring Release: developments are budding. diff --git a/doc/doxygen/options.doc b/doc/doxygen/options.doc index 2ec954e0ed..98f91ccf2b 100644 --- a/doc/doxygen/options.doc +++ b/doc/doxygen/options.doc @@ -112,7 +112,6 @@ int main(int argc, char *argv[]) { - \c network/maxmin-selective-update: \ref options_model_optim - \c network/model: \ref options_model_select - \c network/optim: \ref options_model_optim -- \c network/sender_gap: \ref options_model_network_sendergap - \c network/TCP-gamma: \ref options_model_network_gamma - \c network/weight-S: \ref options_model_network_coefs @@ -373,15 +372,6 @@ can be set to 0 (disable this feature) or 1 (enable it). Note that with the default host model this option is activated by default. -\subsubsection options_model_network_sendergap Simulating sender gap - -(this configuration item is experimental and may change or disapear) - -It is possible to specify a timing gap between consecutive emission on -the same network card through the \b network/sender-gap item. This -is still under investigation as of writting, and the default value is -to wait 10 microseconds (1e-5 seconds) between emissions. - \subsubsection options_model_network_asyncsend Simulating asyncronous send (this configuration item is experimental and may change or disapear) diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 411595279c..532f1cff49 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -60,7 +60,6 @@ SG_BEGIN_DECL() /* user-visible parameters */ extern XBT_PRIVATE double sg_tcp_gamma; -extern XBT_PRIVATE double sg_sender_gap; extern XBT_PRIVATE double sg_latency_factor; extern XBT_PRIVATE double sg_bandwidth_factor; extern XBT_PRIVATE double sg_weight_S_parameter; diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp index 5bc246a2af..0da6263839 100644 --- a/src/simgrid/sg_config.cpp +++ b/src/simgrid/sg_config.cpp @@ -341,11 +341,6 @@ void sg_config_init(int *argc, char **argv) /* The parameters of network models */ - // real default for "network/sender-gap" is set in network_smpi.cpp: - sg_sender_gap = NAN; - simgrid::config::bindFlag(sg_sender_gap, {"network/sender-gap", "network/sender_gap"}, - "Minimum gap between two overlapping sends"); - sg_latency_factor = 13.01; // comes from the default LV08 network model simgrid::config::bindFlag(sg_latency_factor, {"network/latency-factor", "network/latency_factor"}, "Correction factor to apply to the provided latency (default value set by network model)"); diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 82384eede0..54418ed840 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -13,7 +13,6 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network); -double sg_sender_gap = 0.0; double sg_latency_factor = 1.0; /* default value; can be set by model or from command line */ double sg_bandwidth_factor = 1.0; /* default value; can be set by model or from command line */ double sg_weight_S_parameter = 0.0; /* default value; can be set by model or from command line */ diff --git a/src/surf/network_smpi.cpp b/src/surf/network_smpi.cpp index 1d0d2cd7b7..b559d234c1 100644 --- a/src/surf/network_smpi.cpp +++ b/src/surf/network_smpi.cpp @@ -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); - xbt_cfg_setdefault_double("network/sender-gap", 10e-6); xbt_cfg_setdefault_double("network/weight-S", 8775); } diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp index 8ab050fd83..f465a21607 100644 --- a/src/surf/surf_interface.hpp +++ b/src/surf/surf_interface.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2017. 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. */ @@ -25,7 +25,6 @@ /* user-visible parameters */ extern XBT_PRIVATE double sg_tcp_gamma; -extern XBT_PRIVATE double sg_sender_gap; extern XBT_PRIVATE double sg_latency_factor; extern XBT_PRIVATE double sg_bandwidth_factor; extern XBT_PRIVATE double sg_weight_S_parameter; @@ -42,9 +41,6 @@ XBT_PUBLIC(double) surf_get_clock(); */ XBT_PUBLIC_DATA(std::vector) host_that_restart; - -extern XBT_PRIVATE double sg_sender_gap; - namespace simgrid { namespace surf { -- 2.20.1