From: Frederic Suter Date: Wed, 5 Jul 2017 13:17:21 +0000 (+0200) Subject: don't use old values in doc and alternate models X-Git-Tag: v3_17~468 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/92e7e33dd90bba0dd78d4893e68bfbfb03efc3c9?hp=99a3a33a5d47d80e93aa6126ef3b861978c405c9 don't use old values in doc and alternate models --- diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp index ff40e0cb75..c3c06668df 100644 --- a/src/simgrid/sg_config.cpp +++ b/src/simgrid/sg_config.cpp @@ -346,17 +346,16 @@ void sg_config_init(int *argc, char **argv) simgrid::config::bindFlag(sg_sender_gap, {"network/sender-gap", "network/sender_gap"}, "Minimum gap between two overlapping sends"); - sg_latency_factor = 1.0; + 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)"); - sg_bandwidth_factor = 1.0; + sg_bandwidth_factor = 0.97; // comes from the default LV08 network model simgrid::config::bindFlag( sg_bandwidth_factor, {"network/bandwidth-factor", "network/bandwidth_factor"}, "Correction factor to apply to the provided bandwidth (default value set by network model)"); - // real default for "network/weight-S" is set in network_*.cpp: - sg_weight_S_parameter = NAN; + sg_weight_S_parameter = 20537; // comes from the default LV08 network model simgrid::config::bindFlag( sg_weight_S_parameter, {"network/weight-S", "network/weight_S"}, "Correction factor to apply to the weight of competing streams (default value set by network model)"); diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 2a867cf9ee..40c30620aa 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -93,9 +93,9 @@ void surf_network_model_init_Reno() lmm_set_default_protocol_function(func_reno_f, func_reno_fp, func_reno_fpi); - xbt_cfg_setdefault_double("network/latency-factor", 10.4); - xbt_cfg_setdefault_double("network/bandwidth-factor", 0.92); - xbt_cfg_setdefault_double("network/weight-S", 8775); + xbt_cfg_setdefault_double("network/latency-factor", 13.01); + xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97); + xbt_cfg_setdefault_double("network/weight-S", 20537); } @@ -109,9 +109,9 @@ void surf_network_model_init_Reno2() lmm_set_default_protocol_function(func_reno2_f, func_reno2_fp, func_reno2_fpi); - xbt_cfg_setdefault_double("network/latency-factor", 10.4); - xbt_cfg_setdefault_double("network/bandwidth-factor", 0.92); - xbt_cfg_setdefault_double("network/weight-S", 8775); + xbt_cfg_setdefault_double("network/latency-factor", 13.01); + xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97); + xbt_cfg_setdefault_double("network/weight-S", 20537); } void surf_network_model_init_Vegas() @@ -124,9 +124,9 @@ void surf_network_model_init_Vegas() lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, func_vegas_fpi); - xbt_cfg_setdefault_double("network/latency-factor", 10.4); - xbt_cfg_setdefault_double("network/bandwidth-factor", 0.92); - xbt_cfg_setdefault_double("network/weight-S", 8775); + xbt_cfg_setdefault_double("network/latency-factor", 13.01); + xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97); + xbt_cfg_setdefault_double("network/weight-S", 20537); } namespace simgrid { diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index 5011054f3b..fedd818021 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -47,25 +47,31 @@ s_surf_model_description_t surf_plugin_description[] = { /* Don't forget to update the option description in smx_config when you change this */ s_surf_model_description_t surf_network_model_description[] = { - {"LV08", "Realistic network analytic model (slow-start modeled by multiplying latency by 10.4, bandwidth by .92; bottleneck sharing uses a payload of S=8775 for evaluating RTT). ", - &surf_network_model_init_LegrandVelho}, - {"Constant", - "Simplistic network model where all communication take a constant time (one second). This model provides the lowest realism, but is (marginally) faster.", - &surf_network_model_init_Constant}, - {"SMPI", "Realistic network model specifically tailored for HPC settings (accurate modeling of slow start with correction factors on three intervals: < 1KiB, < 64 KiB, >= 64 KiB)", - &surf_network_model_init_SMPI}, - {"IB", "Realistic network model specifically tailored for HPC settings, with Infiniband contention model", - &surf_network_model_init_IB}, - {"CM02", "Legacy network analytic model (Very similar to LV08, but without corrective factors. The timings of small messages are thus poorly modeled).", - &surf_network_model_init_CM02}, - {"NS3", "Network pseudo-model using the NS3 tcp model instead of an analytic model", &surf_network_model_init_NS3}, - {"Reno", "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).", - &surf_network_model_init_Reno}, - {"Reno2", "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).", - &surf_network_model_init_Reno2}, - {"Vegas", "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).", - &surf_network_model_init_Vegas}, - {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */ + {"LV08", "Realistic network analytic model (slow-start modeled by multiplying latency by 13.01, bandwidth by .97; " + "bottleneck sharing uses a payload of S=20537 for evaluating RTT). ", + &surf_network_model_init_LegrandVelho}, + {"Constant", "Simplistic network model where all communication take a constant time (one second). This model " + "provides the lowest realism, but is (marginally) faster.", + &surf_network_model_init_Constant}, + {"SMPI", "Realistic network model specifically tailored for HPC settings (accurate modeling of slow start with " + "correction factors on three intervals: < 1KiB, < 64 KiB, >= 64 KiB)", + &surf_network_model_init_SMPI}, + {"IB", "Realistic network model specifically tailored for HPC settings, with Infiniband contention model", + &surf_network_model_init_IB}, + {"CM02", "Legacy network analytic model (Very similar to LV08, but without corrective factors. The timings of " + "small messages are thus poorly modeled).", + &surf_network_model_init_CM02}, + {"NS3", "Network pseudo-model using the NS3 tcp model instead of an analytic model", &surf_network_model_init_NS3}, + {"Reno", + "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).", + &surf_network_model_init_Reno}, + {"Reno2", + "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).", + &surf_network_model_init_Reno2}, + {"Vegas", + "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).", + &surf_network_model_init_Vegas}, + {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */ }; #if ! HAVE_SMPI