X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d50a590cfb08f9f45bab9fd355eed8dbdcf765ea..59d583b361923a665cac4daa80565eb2224e9d25:/src/surf/surf_interface.cpp diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index 21b718bcd8..05ea270185 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -7,10 +7,11 @@ #include "mc/mc.h" #include "simgrid/s4u/Engine.hpp" #include "simgrid/sg_config.hpp" -#include "src/internal_config.h" -#include "src/simgrid/version.h" +#include "src/kernel/resource/profile/FutureEvtSet.hpp" +#include "src/kernel/resource/profile/Profile.hpp" #include "src/surf/HostImpl.hpp" #include "src/surf/xml/platf.hpp" +#include "src/xbt_modinter.h" /* whether initialization was already done */ #include "surf/surf.hpp" #include "xbt/module.h" @@ -53,30 +54,26 @@ XBT_PUBLIC void simgrid_add_plugin_description(const char* name, const char* des /* Don't forget to update the option description in smx_config when you change this */ const std::vector surf_network_model_description = { - {"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). ", + {"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.", + {"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)", + {"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).", + {"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}, + {"ns-3", "Network pseudo-model using the ns-3 tcp model instead of an analytic model", + &surf_network_model_init_NS3}, }; #if ! HAVE_SMPI @@ -89,12 +86,12 @@ void surf_network_model_init_IB() { #endif #if !SIMGRID_HAVE_NS3 void surf_network_model_init_NS3() { - xbt_die("Please activate NS3 support in cmake and install the dependencies to use the NS3 network model."); + xbt_die("Please activate ns-3 support in cmake and install the dependencies to use the NS3 network model."); } #endif const std::vector surf_cpu_model_description = { - {"Cas01", "Simplistic CPU model (time=size/power).", &surf_cpu_model_init_Cas01}, + {"Cas01", "Simplistic CPU model (time=size/speed).", &surf_cpu_model_init_Cas01}, }; const std::vector surf_host_model_description = { @@ -114,6 +111,10 @@ const std::vector surf_optimization_mode_description = {"Full", "Full update of remaining and variables. Slow but may be useful when debugging.", nullptr}, }; +const std::vector surf_disk_model_description = { + {"default", "Simplistic disk model.", &surf_disk_model_init_default}, +}; + const std::vector surf_storage_model_description = { {"default", "Simplistic storage model.", &surf_storage_model_init_default}, }; @@ -186,9 +187,9 @@ FILE* surf_fopen(const std::string& name, const char* mode) /** Displays the long description of all registered models, and quit */ void model_help(const char* category, const std::vector& table) { - printf("Long description of the %s models accepted by this simulator:\n", category); + XBT_HELP("Long description of the %s models accepted by this simulator:", category); for (auto const& item : table) - printf(" %s: %s\n", item.name, item.description); + XBT_HELP(" %s: %s", item.name, item.description); } int find_model_description(const std::vector& table, const std::string& name) @@ -212,90 +213,12 @@ int find_model_description(const std::vector& table, c return -1; } -void sg_version_check(int lib_version_major, int lib_version_minor, int lib_version_patch) -{ - if ((lib_version_major != SIMGRID_VERSION_MAJOR) || (lib_version_minor != SIMGRID_VERSION_MINOR)) { - fprintf(stderr, "FATAL ERROR: Your program was compiled with SimGrid version %d.%d.%d, " - "and then linked against SimGrid %d.%d.%d. Please fix this.\n", - lib_version_major, lib_version_minor, lib_version_patch, SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR, - SIMGRID_VERSION_PATCH); - abort(); - } - if (lib_version_patch != SIMGRID_VERSION_PATCH) { - if (SIMGRID_VERSION_PATCH > 89 || lib_version_patch > 89) { - fprintf( - stderr, - "FATAL ERROR: Your program was compiled with SimGrid version %d.%d.%d, " - "and then linked against SimGrid %d.%d.%d. \n" - "One of them is a development version, and should not be mixed with the stable release. Please fix this.\n", - lib_version_major, lib_version_minor, lib_version_patch, SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR, - SIMGRID_VERSION_PATCH); - abort(); - } - fprintf(stderr, "Warning: Your program was compiled with SimGrid version %d.%d.%d, " - "and then linked against SimGrid %d.%d.%d. Proceeding anyway.\n", - lib_version_major, lib_version_minor, lib_version_patch, SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR, - SIMGRID_VERSION_PATCH); - } -} - -void sg_version_get(int* ver_major, int* ver_minor, int* ver_patch) -{ - *ver_major = SIMGRID_VERSION_MAJOR; - *ver_minor = SIMGRID_VERSION_MINOR; - *ver_patch = SIMGRID_VERSION_PATCH; -} - -void sg_version() -{ - std::printf("This program was linked against %s (git: %s), found in %s.\n", - SIMGRID_VERSION_STRING, SIMGRID_GIT_VERSION, SIMGRID_INSTALL_PREFIX); - -#if SIMGRID_HAVE_MC - std::printf(" Model-checking support compiled in.\n"); -#else - std::printf(" Model-checking support disabled at compilation.\n"); -#endif - -#if SIMGRID_HAVE_NS3 - std::printf(" NS3 support compiled in.\n"); -#else - std::printf(" NS3 support disabled at compilation.\n"); -#endif - -#if SIMGRID_HAVE_JEDULE - std::printf(" Jedule support compiled in.\n"); -#else - std::printf(" Jedule support disabled at compilation.\n"); -#endif - -#if SIMGRID_HAVE_LUA - std::printf(" Lua support compiled in.\n"); -#else - std::printf(" Lua support disabled at compilation.\n"); -#endif - -#if SIMGRID_HAVE_MALLOCATOR - std::printf(" Mallocator support compiled in.\n"); -#else - std::printf(" Mallocator support disabled at compilation.\n"); -#endif - - std::printf("\nTo cite SimGrid in a publication, please use:\n" - " Henri Casanova, Arnaud Giersch, Arnaud Legrand, Martin Quinson, Frédéric Suter. \n" - " Versatile, Scalable, and Accurate Simulation of Distributed Applications and Platforms. \n" - " Journal of Parallel and Distributed Computing, Elsevier, 2014, 74 (10), pp.2899-2917.\n"); - std::printf("The pdf file and a BibTeX entry for LaTeX users can be found at http://hal.inria.fr/hal-01017319\n"); -} void surf_init(int *argc, char **argv) { - if (USER_HOST_LEVEL != -1) // Already initialized + if (xbt_initialized > 0) return; - XBT_DEBUG("Create all Libs"); - USER_HOST_LEVEL = simgrid::s4u::Host::extension_create(nullptr); - xbt_init(argc, argv); sg_config_init(argc, argv);