* The callback functions of cpu_model and network_model will be called from
* those of these host models. */
xbt_dynar_t all_existing_models = NULL; /* to destroy models correctly */
-xbt_dynar_t model_list_invoke = NULL; /* for invoking callbacks */
+xbt_dynar_t model_list_invoke = NULL; /* to invoke callbacks */
-tmgr_history_t history = NULL;
-lmm_system_t maxmin_system = NULL;
+sg_future_evt_set_t future_evt_set = nullptr;
xbt_dynar_t surf_path = NULL;
xbt_dynar_t host_that_restart = NULL;
xbt_dict_t watched_hosts_lib;
namespace simgrid {
namespace surf {
-simgrid::surf::signal<void(void)> surfExitCallbacks;
+simgrid::xbt::signal<void(void)> surfExitCallbacks;
}
}
+#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},
{NULL, NULL, NULL} /* this array must be NULL terminated */
{
XBT_DEBUG("Create all Libs");
host_list = xbt_dict_new_homogeneous([](void*p) {
- delete static_cast<simgrid::Host*>(p);
+ simgrid::s4u::Host* host = static_cast<simgrid::s4u::Host*>(p);
+ simgrid::s4u::Host::onDestruction(*host);
+ delete host;
});
as_router_lib = xbt_lib_new();
storage_lib = xbt_lib_new();
ROUTING_PROP_ASR_LEVEL = xbt_lib_add_level(as_router_lib,routing_asr_prop_free);
XBT_DEBUG("Add SURF levels");
+ simgrid::surf::Host::classInit();
SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_storage_free);
xbt_init(argc, argv);
all_existing_models = xbt_dynar_new(sizeof(simgrid::surf::Model*), NULL);
if (!model_list_invoke)
model_list_invoke = xbt_dynar_new(sizeof(simgrid::surf::Model*), NULL);
- if (!history)
- history = tmgr_history_new();
+ if (!future_evt_set)
+ future_evt_set = new simgrid::trace_mgr::future_evt_set();
TRACE_add_start_function(TRACE_surf_alloc);
TRACE_add_end_function(TRACE_surf_release);
simgrid::surf::surfExitCallbacks();
- if (maxmin_system) {
- lmm_system_free(maxmin_system);
- maxmin_system = NULL;
- }
- if (history) {
- tmgr_history_free(history);
- history = NULL;
+ if (future_evt_set) {
+ delete future_evt_set;
+ future_evt_set = nullptr;
}
#ifdef CONTEXT_THREADS
namespace simgrid {
namespace surf {
-Resource::Resource()
-: p_name(NULL), p_model(NULL)
-{} // FIXME: DEADCODE?
-
Resource::Resource(Model *model, const char *name)
- : Resource(model, name, 1/*SURF_RESOURCE_ON*/)
-{} // FIXME: DEADCODE?
+ : Resource(model, name, 1/*ON*/)
+{}
Resource::Resource(Model *model, const char *name, lmm_constraint_t constraint)
- : Resource(model, name, constraint, 1/*SURF_RESOURCE_ON*/)
+ : Resource(model, name, constraint, 1/*ON*/)
{}
Resource::Resource(Model *model, const char *name, lmm_constraint_t constraint, int initiallyOn)
: p_name(xbt_strdup(name))
, p_model(model)
, m_isOn(initiallyOn)
-{} // FIXME: DEADCODE?
+{}
Resource::~Resource() {
lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), priority);
if (getModel()->getUpdateMechanism() == UM_LAZY)
- heapRemove(getModel()->getActionHeap());
+ heapRemove(getModel()->getActionHeap());
XBT_OUT();
}