#include "mc/mc.h"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/sg_config.hpp"
+#include "src/kernel/resource/profile/FutureEvtSet.hpp"
+#include "src/kernel/resource/profile/Profile.hpp"
#include "src/simgrid/version.h"
#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"
/* Don't forget to update the option description in smx_config when you change this */
const std::vector<surf_model_description_t> 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
#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
{"Full", "Full update of remaining and variables. Slow but may be useful when debugging.", nullptr},
};
+const std::vector<surf_model_description_t> surf_disk_model_description = {
+ {"default", "Simplistic disk model.", &surf_disk_model_init_default},
+};
+
const std::vector<surf_model_description_t> surf_storage_model_description = {
{"default", "Simplistic storage model.", &surf_storage_model_init_default},
};
#endif
#if SIMGRID_HAVE_NS3
- XBT_HELP(" NS3 support compiled in.");
+ XBT_HELP(" ns-3 support compiled in.");
#else
- XBT_HELP(" NS3 support disabled at compilation.");
+ XBT_HELP(" ns-3 support disabled at compilation.");
#endif
#if SIMGRID_HAVE_JEDULE
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);