#include "virtual_machine.hpp"
#include "src/instr/instr_private.h" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
#include "simgrid/s4u/engine.hpp"
+#include <vector>
XBT_LOG_NEW_CATEGORY(surf, "All SURF categories");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (kernel)");
/* model_list_invoke contains only surf_host and surf_vm.
* The callback functions of cpu_model and network_model will be called from those of these host models. */
-xbt_dynar_t all_existing_models = nullptr; /* to destroy models correctly */
+std::vector<surf_model_t> * all_existing_models = nullptr; /* to destroy models correctly */
xbt_dynar_t model_list_invoke = nullptr; /* to invoke callbacks */
simgrid::trace_mgr::future_evt_set *future_evt_set = nullptr;
xbt_dynar_t surf_path = nullptr;
-xbt_dynar_t host_that_restart = xbt_dynar_new(sizeof(char*), nullptr);
+std::vector<simgrid::s4u::Host*> host_that_restart;
xbt_dict_t watched_hosts_lib;
namespace simgrid {
#include <simgrid/plugins/energy.h> // FIXME: this plugin should not be linked to the core
s_surf_model_description_t surf_plugin_description[] = {
- {"Energy", "Cpu energy consumption.", sg_energy_plugin_init},
+ {"Energy", "Cpu energy consumption.", &sg_energy_plugin_init},
{nullptr, nullptr, nullptr} /* this array must be nullptr terminated */
};
/* 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},
+ &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},
+ &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},
+ &surf_network_model_init_SMPI},
{"IB", "Realistic network model specifically tailored for HPC settings, with Infiniband contention model",
- surf_network_model_init_IB},
+ &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},
-#if HAVE_NS3
- {"NS3", "Network pseudo-model using the NS3 tcp model instead of an analytic model", surf_network_model_init_NS3},
-#endif
+ &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},
+ &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},
+ &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},
+ &surf_network_model_init_Vegas},
{nullptr, nullptr, nullptr} /* this array must be nullptr terminated */
};
+#if ! HAVE_SMPI
+void surf_network_model_init_SMPI() {
+ xbt_die("Please activate SMPI support in cmake to use the SMPI network model.");
+}
+void surf_network_model_init_IB() {
+ xbt_die("Please activate SMPI support in cmake to use the IB network model.");
+}
+#endif
+#if !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.");
+}
+#endif
+
s_surf_model_description_t surf_cpu_model_description[] = {
- {"Cas01", "Simplistic CPU model (time=size/power).", surf_cpu_model_init_Cas01},
+ {"Cas01", "Simplistic CPU model (time=size/power).", &surf_cpu_model_init_Cas01},
{nullptr, nullptr, nullptr} /* this array must be nullptr terminated */
};
s_surf_model_description_t surf_host_model_description[] = {
- {"default", "Default host model. Currently, CPU:Cas01 and network:LV08 (with cross traffic enabled)", surf_host_model_init_current_default},
- {"compound", "Host model that is automatically chosen if you change the network and CPU models", surf_host_model_init_compound},
- {"ptask_L07", "Host model somehow similar to Cas01+CM02 but allowing parallel tasks", surf_host_model_init_ptask_L07},
+ {"default", "Default host model. Currently, CPU:Cas01 and network:LV08 (with cross traffic enabled)", &surf_host_model_init_current_default},
+ {"compound", "Host model that is automatically chosen if you change the network and CPU models", &surf_host_model_init_compound},
+ {"ptask_L07", "Host model somehow similar to Cas01+CM02 but allowing parallel tasks", &surf_host_model_init_ptask_L07},
{nullptr, nullptr, nullptr} /* this array must be nullptr terminated */
};
s_surf_model_description_t surf_vm_model_description[] = {
- {"default", "Default vm model.", surf_vm_model_init_HL13},
+ {"default", "Default vm model.", &surf_vm_model_init_HL13},
{nullptr, nullptr, nullptr} /* this array must be nullptr terminated */
};
};
s_surf_model_description_t surf_storage_model_description[] = {
- {"default", "Simplistic storage model.", surf_storage_model_init_default},
+ {"default", "Simplistic storage model.", &surf_storage_model_init_default},
{nullptr, nullptr, nullptr} /* this array must be nullptr terminated */
};
void surf_init(int *argc, char **argv)
{
- if (host_list != nullptr) // Already initialized
+ if (USER_HOST_LEVEL != -1) // Already initialized
return;
XBT_DEBUG("Create all Libs");
- host_list = xbt_dict_new_homogeneous([](void*p) {
- simgrid::s4u::Host* host = static_cast<simgrid::s4u::Host*>(p);
- simgrid::s4u::Host::onDestruction(*host);
- delete host;
- });
USER_HOST_LEVEL = simgrid::s4u::Host::extension_create(nullptr);
as_router_lib = xbt_lib_new();
});
XBT_DEBUG("Add SURF levels");
- simgrid::surf::HostImpl::classInit();
SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_storage_free);
xbt_init(argc, argv);
if (!all_existing_models)
- all_existing_models = xbt_dynar_new(sizeof(simgrid::surf::Model*), nullptr);
+ all_existing_models = new std::vector<simgrid::surf::Model*>();
if (!model_list_invoke)
model_list_invoke = xbt_dynar_new(sizeof(simgrid::surf::Model*), nullptr);
if (!future_evt_set)
void surf_exit()
{
- unsigned int iter;
- simgrid::surf::Model *model = nullptr;
+ TRACE_end(); /* Just in case it was not called by the upper layer (or there is no upper layer) */
- TRACE_end(); /* Just in case it was not called by the upper
- * layer (or there is no upper layer) */
-
- sg_config_finalize();
-
- xbt_dynar_free(&host_that_restart);
xbt_dynar_free(&surf_path);
- xbt_dict_free(&host_list);
+ sg_host_exit();
xbt_lib_free(&as_router_lib);
xbt_lib_free(&storage_lib);
sg_link_exit();
xbt_lib_free(&file_lib);
xbt_dict_free(&watched_hosts_lib);
- xbt_dynar_foreach(all_existing_models, iter, model)
+ for (auto model : *all_existing_models)
delete model;
- xbt_dynar_free(&all_existing_models);
+ delete all_existing_models;
xbt_dynar_free(&model_list_invoke);
routing_exit();
double Model::next_occuring_event_lazy(double now)
{
- Action *action = nullptr;
- double min = -1;
- double share;
-
- XBT_DEBUG
- ("Before share resources, the size of modified actions set is %zd",
- modifiedSet_->size());
-
+ XBT_DEBUG("Before share resources, the size of modified actions set is %zd", modifiedSet_->size());
lmm_solve(maxminSystem_);
-
- XBT_DEBUG
- ("After share resources, The size of modified actions set is %zd",
- modifiedSet_->size());
+ XBT_DEBUG("After share resources, The size of modified actions set is %zd", modifiedSet_->size());
while(!modifiedSet_->empty()) {
- action = &(modifiedSet_->front());
+ Action *action = &(modifiedSet_->front());
modifiedSet_->pop_front();
int max_dur_flag = 0;
action->updateRemainingLazy(now);
- min = -1;
- share = lmm_variable_getvalue(action->getVariable());
+ double min = -1;
+ double share = lmm_variable_getvalue(action->getVariable());
if (share > 0) {
double time_to_completion;
}
//hereafter must have already the min value for this resource model
- if (xbt_heap_size(actionHeap_) > 0)
- min = xbt_heap_maxkey(actionHeap_) - now;
- else
- min = -1;
-
- XBT_DEBUG("The minimum with the HEAP %f", min);
-
- return min;
+ if (xbt_heap_size(actionHeap_) > 0) {
+ double min = xbt_heap_maxkey(actionHeap_) - now;
+ XBT_DEBUG("minimum with the HEAP %f", min);
+ return min;
+ } else {
+ XBT_DEBUG("The HEAP is empty, thus returning -1");
+ return -1;
+ }
}
double Model::next_occuring_event_full(double /*now*/) {
return 0.0;
}
-double Model::shareResourcesMaxMin(ActionList *running_actions,
- lmm_system_t sys,
- void (*solve) (lmm_system_t))
+double shareResourcesMaxMin(ActionList *runningActions, lmm_system_t sys, void (*solve) (lmm_system_t))
{
- Action *action = nullptr;
- double min = -1;
- double value = -1;
-
solve(sys);
- ActionList::iterator it(running_actions->begin()), itend(running_actions->end());
- for(; it != itend ; ++it) {
- action = &*it;
- value = lmm_variable_getvalue(action->getVariable());
- if ((value > 0) || (action->getMaxDuration() >= 0))
- break;
- }
-
- if (!action)
- return -1.0;
-
- if (value > 0) {
- if (action->getRemains() > 0)
- min = action->getRemainsNoUpdate() / value;
- else
- min = 0.0;
- if ((action->getMaxDuration() >= 0) && (action->getMaxDuration() < min))
- min = action->getMaxDuration();
- } else
- min = action->getMaxDuration();
-
-
- for (++it; it != itend; ++it) {
- action = &*it;
- value = lmm_variable_getvalue(action->getVariable());
+ double min = -1;
+ for(auto it(runningActions->begin()), itend(runningActions->end()); it != itend ; ++it) {
+ Action *action = &*it;
+ double value = lmm_variable_getvalue(action->getVariable());
if (value > 0) {
if (action->getRemains() > 0)
value = action->getRemainsNoUpdate() / value;
else
value = 0.0;
- if (value < min) {
+ if (min < 0 || value < min) {
min = value;
XBT_DEBUG("Updating min (value) with %p: %f", action, min);
}
}
- if ((action->getMaxDuration() >= 0) && (action->getMaxDuration() < min)) {
+ if ((action->getMaxDuration() >= 0) && (min<0 || action->getMaxDuration() < min)) {
min = action->getMaxDuration();
XBT_DEBUG("Updating min (duration) with %p: %f", action, min);
}
void Model::updateActionsState(double now, double delta)
{
if (updateMechanism_ == UM_FULL)
- updateActionsStateFull(now, delta);
+ updateActionsStateFull(now, delta);
else if (updateMechanism_ == UM_LAZY)
- updateActionsStateLazy(now, delta);
+ updateActionsStateLazy(now, delta);
else
- xbt_die("Invalid cpu update mechanism!");
+ xbt_die("Invalid cpu update mechanism!");
}
void Model::updateActionsStateLazy(double /*now*/, double /*delta*/)
