From e1038e90b6035149be3fa02273cff848f4914ac9 Mon Sep 17 00:00:00 2001 From: Gabriel Corona Date: Mon, 2 May 2016 16:30:21 +0200 Subject: [PATCH] [config] Use the c++ API for some configuration flags --- src/include/smpi/smpi_interface.h | 3 - src/simgrid/sg_config.cpp | 116 +++++++++--------------------- src/smpi/smpi_base.cpp | 12 +++- src/surf/network_ns3.cpp | 8 ++- 4 files changed, 49 insertions(+), 90 deletions(-) diff --git a/src/include/smpi/smpi_interface.h b/src/include/smpi/smpi_interface.h index 73dd68d737..4f5686aef9 100644 --- a/src/include/smpi/smpi_interface.h +++ b/src/include/smpi/smpi_interface.h @@ -94,9 +94,6 @@ XBT_PUBLIC(int) find_coll_description(s_mpi_coll_description_t * table, char *na XBT_PUBLIC_DATA(void) (*smpi_coll_cleanup_callback)(void); XBT_PUBLIC(void) smpi_coll_cleanup_mvapich2(void); -extern XBT_PRIVATE double smpi_wtime_sleep; -extern XBT_PRIVATE double smpi_iprobe_sleep; -extern XBT_PRIVATE double smpi_test_sleep; SG_END_DECL() diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp index f90dfa98c3..8459539872 100644 --- a/src/simgrid/sg_config.cpp +++ b/src/simgrid/sg_config.cpp @@ -8,6 +8,7 @@ #include "xbt/misc.h" #include "xbt/config.h" +#include "xbt/config.hpp" #include "xbt/log.h" #include "xbt/mallocator.h" #include "xbt/str.h" @@ -216,42 +217,6 @@ static void _sg_cfg_cb__network_model(const char *name) find_model_description(surf_network_model_description, val); } -/* callbacks of the network models values */ -static void _sg_cfg_cb__tcp_gamma(const char *name) -{ - sg_tcp_gamma = xbt_cfg_get_double(name); -} - -static void _sg_cfg_cb__maxmin_precision(const char* name) -{ - sg_maxmin_precision = xbt_cfg_get_double(name); -} - -static void _sg_cfg_cb__surf_precision(const char* name) -{ - sg_surf_precision = xbt_cfg_get_double(name); -} - -static void _sg_cfg_cb__sender_gap(const char* name) -{ - sg_sender_gap = xbt_cfg_get_double(name); -} - -static void _sg_cfg_cb__latency_factor(const char *name) -{ - sg_latency_factor = xbt_cfg_get_double(name); -} - -static void _sg_cfg_cb__bandwidth_factor(const char *name) -{ - sg_bandwidth_factor = xbt_cfg_get_double(name); -} - -static void _sg_cfg_cb__weight_S(const char *name) -{ - sg_weight_S_parameter = xbt_cfg_get_double(name); -} - #if HAVE_SMPI /* callback of the mpi collectives: simply check that this is a valid name. It will be picked up in smpi_global.cpp */ static void _check_coll(const char *category, @@ -307,29 +272,8 @@ static void _check_coll_barrier(const char *name){ _check_coll("barrier", mpi_coll_barrier_description, name); } -static void _sg_cfg_cb__wtime_sleep(const char *name){ - smpi_wtime_sleep = xbt_cfg_get_double(name); -} - -static void _sg_cfg_cb__iprobe_sleep(const char *name){ - smpi_iprobe_sleep = xbt_cfg_get_double(name); -} - -static void _sg_cfg_cb__test_sleep(const char *name){ - smpi_test_sleep = xbt_cfg_get_double(name); -} #endif -/* callback of the inclusion path */ -static void _sg_cfg_cb__surf_path(const char *name) -{ - char *path = xbt_cfg_get_string(name); - if (path[0]) {// ignore "" - path = xbt_strdup(path); - xbt_dynar_push(surf_path, &path); - } -} - /* callback to decide if we want to use the model-checking */ #include "src/xbt_modinter.h" @@ -465,30 +409,43 @@ void sg_config_init(int *argc, char **argv) describe_model(description, surf_vm_model_description, "model", "The model to use for the vm"); xbt_cfg_register_string("vm/model", "default", &_sg_cfg_cb__vm_model, description); - xbt_cfg_register_double("network/TCP-gamma", 4194304.0, _sg_cfg_cb__tcp_gamma, - "Size of the biggest TCP window (cat /proc/sys/net/ipv4/tcp_[rw]mem for recv/send window; Use the last given value, which is the max window size)"); - xbt_cfg_register_alias("network/TCP-gamma","network/TCP_gamma"); - xbt_cfg_register_double("surf/precision", 0.00001, _sg_cfg_cb__surf_precision, - "Numerical precision used when updating simulation times (in seconds)"); - xbt_cfg_register_double("maxmin/precision", 0.00001, _sg_cfg_cb__maxmin_precision, - "Numerical precision used when computing resource sharing (in ops/sec or bytes/sec)"); + simgrid::config::bindFlag(sg_tcp_gamma = 4194304.0, + { "network/TCP-gamma", "network/TCP_gamma" }, + "Size of the biggest TCP window (cat /proc/sys/net/ipv4/tcp_[rw]mem for recv/send window; Use the last given value, which is the max window size)"); + simgrid::config::bindFlag(sg_surf_precision = 0.00001, + "surf/precision", + "Numerical precision used when updating simulation times (in seconds)"); + simgrid::config::bindFlag(sg_maxmin_precision = 0.00001, + "maxmin/precision", + "Numerical precision used when computing resource sharing (in ops/sec or bytes/sec)"); /* The parameters of network models */ - xbt_cfg_register_double("network/sender-gap", NAN, _sg_cfg_cb__sender_gap, - "Minimum gap between two overlapping sends"); /* real default for "network/sender-gap" is set in network_smpi.cpp */ - xbt_cfg_register_alias("network/sender-gap","network/sender_gap"); - xbt_cfg_register_double("network/latency-factor", 1.0, _sg_cfg_cb__latency_factor, - "Correction factor to apply to the provided latency (default value set by network model)"); - xbt_cfg_register_alias("network/latency-factor","network/latency_factor"); - xbt_cfg_register_double("network/bandwidth-factor", 1.0, _sg_cfg_cb__bandwidth_factor, "Correction factor to apply to the provided bandwidth (default value set by network model)"); - xbt_cfg_register_alias("network/bandwidth-factor","network/bandwidth_factor"); - xbt_cfg_register_double("network/weight-S", NAN, _sg_cfg_cb__weight_S, /* real default for "network/weight-S" is set in network_*.cpp */ - "Correction factor to apply to the weight of competing streams (default value set by network model)"); - xbt_cfg_register_alias("network/weight-S","network/weight_S"); + // real default for "network/sender-gap" is set in network_smpi.cpp: + simgrid::config::bindFlag(sg_sender_gap = NAN, + { "network/sender-gap", "network/sender_gap" }, + "Minimum gap between two overlapping sends"); + simgrid::config::bindFlag(sg_latency_factor = 1.0, + { "network/latency-factor", "network/latency_factor" }, + "Correction factor to apply to the provided latency (default value set by network model)"); + simgrid::config::bindFlag(sg_bandwidth_factor = 1.0, + { "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: + simgrid::config::bindFlag(sg_weight_S_parameter = NAN, + { "network/weight-S", "network/weight_S" }, + "Correction factor to apply to the weight of competing streams (default value set by network model)"); /* Inclusion path */ - xbt_cfg_register_string("path", "", _sg_cfg_cb__surf_path, "Lookup path for inclusions in platform and deployment XML files"); + simgrid::config::declareFlag("path", + "Lookup path for inclusions in platform and deployment XML files", + "", + [](std::string const& path) { + if (path[0] != '\0') { + char* copy = xbt_strdup(path.c_str()); + xbt_dynar_push(surf_path, ©); + } + }); xbt_cfg_register_boolean("cpu/maxmin-selective-update", "no", NULL, "Update the constraint set propagating recursively to others constraints (off by default when optim is set to lazy)"); @@ -580,10 +537,6 @@ void sg_config_init(int *argc, char **argv) xbt_cfg_register_boolean("network/crosstraffic", "yes", _sg_cfg_cb__surf_network_crosstraffic, "Activate the interferences between uploads and downloads for fluid max-min models (LV08, CM02)"); -#if HAVE_NS3 - xbt_cfg_register_string("ns3/TcpModel", "default", NULL, "The ns3 tcp model can be : NewReno or Reno or Tahoe"); -#endif - //For smpi/bw_factor and smpi/lat_factor // SMPI model can be used without enable_smpi, so keep this out of the ifdef. xbt_cfg_register_string("smpi/bw-factor", @@ -631,9 +584,6 @@ void sg_config_init(int *argc, char **argv) xbt_cfg_register_string("smpi/os", "1:0:0:0:0", NULL, "Small messages timings (MPI_Send minimum time for small messages)"); xbt_cfg_register_string("smpi/ois", "1:0:0:0:0", NULL, "Small messages timings (MPI_Isend minimum time for small messages)"); xbt_cfg_register_string("smpi/or", "1:0:0:0:0", NULL, "Small messages timings (MPI_Recv minimum time for small messages)"); - xbt_cfg_register_double("smpi/iprobe", 1e-4, _sg_cfg_cb__iprobe_sleep, "Minimum time to inject inside a call to MPI_Iprobe"); - xbt_cfg_register_double("smpi/test", 1e-4, _sg_cfg_cb__test_sleep, "Minimum time to inject inside a call to MPI_Test"); - xbt_cfg_register_double("smpi/wtime", 0.0, _sg_cfg_cb__wtime_sleep, "Minimum time to inject inside a call to MPI_Wtime"); xbt_cfg_register_string("smpi/coll-selector", "default", NULL, "Which collective selector to use"); xbt_cfg_register_alias("smpi/coll-selector","smpi/coll_selector"); diff --git a/src/smpi/smpi_base.cpp b/src/smpi/smpi_base.cpp index e892f89f3b..53f600bcc6 100644 --- a/src/smpi/smpi_base.cpp +++ b/src/smpi/smpi_base.cpp @@ -4,6 +4,8 @@ /* 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 + #include "private.h" #include "xbt/virtu.h" #include "mc/mc.h" @@ -68,13 +70,17 @@ typedef struct s_smpi_factor_multival { // FIXME: this should be merged (dedupli int nb_values; double values[4];//arbitrary set to 4 } s_smpi_factor_multival_t; + xbt_dynar_t smpi_os_values = NULL; xbt_dynar_t smpi_or_values = NULL; xbt_dynar_t smpi_ois_values = NULL; -double smpi_wtime_sleep = 0.0; -double smpi_iprobe_sleep = 1e-4; -double smpi_test_sleep = 1e-4; +static XBT_PRIVATE simgrid::config::Flag smpi_wtime_sleep( + "smpi/wtime", "Minimum time to inject inside a call to MPI_Wtime", 0.0); +static XBT_PRIVATE simgrid::config::Flag smpi_iprobe_sleep( + "smpi/iprobe", "Minimum time to inject inside a call to MPI_Iprobe", 1e-4); +static XBT_PRIVATE simgrid::config::Flag smpi_test_sleep( + "smpi/test", "Minimum time to inject inside a call to MPI_Test", 1e-4); static int factor_cmp(const void *pa, const void *pb) { diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index 903bdff959..e42338e2ff 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -6,6 +6,8 @@ #include +#include + #include "ns3/core-module.h" #include "ns3/node.h" @@ -215,11 +217,15 @@ void surf_network_model_init_NS3() xbt_dynar_push(all_existing_models, &surf_network_model); } +static simgrid::config::Flag ns3_tcp_model("ns3/TcpModel", + "The ns3 tcp model can be : NewReno or Reno or Tahoe", + "default"); + namespace simgrid { namespace surf { NetworkNS3Model::NetworkNS3Model() : NetworkModel() { - ns3_initialize(xbt_cfg_get_string("ns3/TcpModel")); + ns3_initialize(ns3_tcp_model.get().c_str()); routing_model_create(NULL); simgrid::s4u::Host::onCreation.connect(ns3_add_host); -- 2.20.1