X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5413861364085b5ed2c3c1fec4bcbf5b7eee530e..a61fb58caf710c35e14f2d2d1156bd8d491889f8:/src/simgrid/sg_config.cpp diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp index e60efa33ba..1e25468e3e 100644 --- a/src/simgrid/sg_config.cpp +++ b/src/simgrid/sg_config.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2022. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2023. 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. */ @@ -8,12 +8,15 @@ #include #include #include +#include #include "simgrid/sg_config.hpp" +#include "src/include/xbt/mmalloc.h" #include "src/instr/instr_private.hpp" #include "src/internal_config.h" #include "src/kernel/context/Context.hpp" #include "src/kernel/lmm/maxmin.hpp" +#include "src/kernel/resource/NetworkModel.hpp" #include "src/mc/mc_config.hpp" #include "src/mc/mc_replay.hpp" #include "src/smpi/include/smpi_config.hpp" @@ -246,7 +249,7 @@ void sg_config_init(int *argc, char **argv) declare_model_flag("cpu/model", "Cas01", &_sg_cfg_cb__cpu_model, surf_cpu_model_description, "model", "The model to use for the CPU"); - declare_model_flag("disk/model", "default", &_sg_cfg_cb__disk_model, surf_disk_model_description, "model", + declare_model_flag("disk/model", "S19", &_sg_cfg_cb__disk_model, surf_disk_model_description, "model", "The model to use for the disk"); declare_model_flag("network/model", "LV08", &_sg_cfg_cb__network_model, surf_network_model_description, "model", @@ -269,21 +272,6 @@ void sg_config_init(int *argc, char **argv) "processes on each host, at higher level. (default: -1 means no such limitation)"); /* The parameters of network models */ - - sg_latency_factor = 13.01; // comes from the default LV08 network model - simgrid::config::bind_flag(sg_latency_factor, "network/latency-factor", - "Correction factor to apply to the provided latency (default value set by network model)"); - - sg_bandwidth_factor = 0.97; // comes from the default LV08 network model - simgrid::config::bind_flag( - sg_bandwidth_factor, "network/bandwidth-factor", - "Correction factor to apply to the provided bandwidth (default value set by network model)"); - - sg_weight_S_parameter = 20537; // comes from the default LV08 network model - simgrid::config::bind_flag( - sg_weight_S_parameter, "network/weight-S", - "Correction factor to apply to the weight of competing streams (default value set by network model)"); - static simgrid::config::Flag _sg_network_loopback_latency{ "network/loopback-lat", "For network models with an implicit loopback link (L07, CM02, LV08), " @@ -298,9 +286,9 @@ void sg_config_init(int *argc, char **argv) /* Inclusion path */ static simgrid::config::Flag cfg_path{ - "path", "Lookup path for inclusions in platform and deployment XML files", "", [](std::string const& path) { + "path", "Lookup path for inclusions in platform and deployment XML files", "./", [](std::string const& path) { if (not path.empty()) - surf_path.push_back(path); + simgrid::xbt::path_push(path); }}; static simgrid::config::Flag cfg_cpu_maxmin_selective_update{ @@ -319,7 +307,7 @@ void sg_config_init(int *argc, char **argv) [](int value) { simgrid::kernel::context::stack_size = value * 1024; }}; /* guard size for contexts stacks in memory pages */ -#if defined(_WIN32) || (PTH_STACKGROWTH != -1) +#if (PTH_STACKGROWTH != -1) int default_guard_size = 0; #else int default_guard_size = 1; @@ -327,9 +315,17 @@ void sg_config_init(int *argc, char **argv) static simgrid::config::Flag cfg_context_guard_size{ "contexts/guard-size", "Guard size for contexts stacks in memory pages", default_guard_size, [](int value) { simgrid::kernel::context::guard_size = value * xbt_pagesize; }}; - static simgrid::config::Flag cfg_context_nthreads{"contexts/nthreads", - "Number of parallel threads used to execute user contexts", 1, - &simgrid::kernel::context::set_nthreads}; + + static simgrid::config::Flag cfg_context_nthreads{ + "contexts/nthreads", "Number of parallel threads used to execute user contexts", 1, [](int nthreads) { +#if HAVE_MMALLOC + xbt_assert( + nthreads == 1 || not malloc_use_mmalloc(), + "Parallel simulation is forbidden in the verified program, as there is no protection against race " + "conditions in mmalloc itself. Please don't be so greedy and show some mercy for our implementation."); +#endif + simgrid::kernel::context::set_nthreads(nthreads); + }}; /* synchronization mode for parallel user contexts */ #if HAVE_FUTEX_H @@ -343,18 +339,7 @@ void sg_config_init(int *argc, char **argv) default_synchro_mode, &_sg_cfg_cb_contexts_parallel_mode}; - // For smpi/bw-factor and smpi/lat-factor // SMPI model can be used without enable_smpi, so keep this out of the ifdef. - simgrid::config::declare_flag("smpi/bw-factor", - "Bandwidth factors for smpi. Format: " - "'threshold0:value0;threshold1:value1;...;thresholdN:valueN', " - "meaning if(size >=thresholdN ) return valueN.", - "65472:0.940694;15424:0.697866;9376:0.58729;5776:1.08739;3484:0.77493;" - "1426:0.608902;732:0.341987;257:0.338112;0:0.812084"); - - simgrid::config::declare_flag("smpi/lat-factor", "Latency factors for smpi.", - "65472:11.6436;15424:3.48845;9376:2.59299;5776:2.18796;3484:1.88101;" - "1426:1.61075;732:1.9503;257:1.95341;0:2.01467"); static simgrid::config::Flag cfg_smpi_IB_penalty_factors{ "smpi/IB-penalty-factors", "Correction factor to communications using Infiniband model with " @@ -365,9 +350,6 @@ void sg_config_init(int *argc, char **argv) static simgrid::config::Flag cfg_execution_cutpath{ "exception/cutpath", "Whether to cut all path information from call traces, used e.g. in exceptions.", false}; - if (surf_path.empty()) - simgrid::config::set_default("path", "./"); - _sg_cfg_init_status = 1; sg_config_cmd_line(argc, argv);