namespace simgrid {
namespace surf {
-surf_callback(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 (simgrid::Host*)p;
+ delete static_cast<simgrid::Host*>(p);
});
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::init();
+ simgrid::surf::Host::classInit();
SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_storage_free);
xbt_init(argc, argv);
xbt_dynar_free(&model_list_invoke);
routing_exit();
- surf_callback_emit(simgrid::surf::surfExitCallbacks);
+ simgrid::surf::surfExitCallbacks();
if (maxmin_system) {
lmm_system_free(maxmin_system);
namespace simgrid {
namespace surf {
-Resource::Resource()
-: p_name(NULL), p_properties(NULL), p_model(NULL)
-{}
-
-Resource::Resource(Model *model, const char *name, xbt_dict_t props)
- : Resource(model, name, props, SURF_RESOURCE_ON)
+Resource::Resource(Model *model, const char *name)
+ : Resource(model, name, 1/*ON*/)
{}
-Resource::Resource(Model *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint)
- : Resource(model, name, props, constraint, SURF_RESOURCE_ON)
+Resource::Resource(Model *model, const char *name, lmm_constraint_t constraint)
+ : Resource(model, name, constraint, 1/*ON*/)
{}
-Resource::Resource(
- Model *model, const char *name, xbt_dict_t props,
- lmm_constraint_t constraint, e_surf_resource_state_t stateInit)
- : p_name(xbt_strdup(name)), p_properties(props), p_model(model)
- , m_running(true), m_stateCurrent(stateInit), p_constraint(constraint)
+Resource::Resource(Model *model, const char *name, lmm_constraint_t constraint, int initiallyOn)
+ : p_name(xbt_strdup(name))
+ , p_model(model)
+ , m_isOn(initiallyOn)
+ , p_constraint(constraint)
{}
-Resource::Resource(Model *model, const char *name, xbt_dict_t props, e_surf_resource_state_t stateInit)
- : p_name(xbt_strdup(name)), p_properties(props), p_model(model)
- , m_running(true), m_stateCurrent(stateInit)
+Resource::Resource(Model *model, const char *name, int initiallyOn)
+ : p_name(xbt_strdup(name))
+ , p_model(model)
+ , m_isOn(initiallyOn)
{}
+
Resource::~Resource() {
xbt_free((void*)p_name);
- xbt_dict_free(&p_properties);
}
-e_surf_resource_state_t Resource::getState()
-{
- return m_stateCurrent;
+bool Resource::isOn() {
+ return m_isOn;
}
-
-void Resource::setState(e_surf_resource_state_t state)
-{
- m_stateCurrent = state;
-}
-
-bool Resource::isOn()
-{
- return m_running;
+bool Resource::isOff() {
+ return ! m_isOn;
}
void Resource::turnOn()
{
- if (!m_running) {
- m_running = true;
+ if (!m_isOn) {
+ m_isOn = true;
}
}
void Resource::turnOff()
{
- if (m_running) {
- m_running = false;
+ if (m_isOn) {
+ m_isOn = false;
}
}
return p_name;
}
-xbt_dict_t Resource::getProperties() {
- if (p_properties==NULL)
- p_properties = xbt_dict_new();
- return p_properties;
-}
-
lmm_constraint_t Resource::getConstraint() {
return p_constraint;
}
void Action::initialize(simgrid::surf::Model *model, double cost, bool failed,
lmm_variable_t var)
{
- m_priority = 1.0;
- m_refcount = 1;
m_remains = cost;
- m_maxDuration = NO_MAX_DURATION;
- m_finish = -1.0;
m_start = surf_get_clock();
m_cost = cost;
p_model = model;
- p_data = NULL;
p_variable = var;
- m_lastValue = 0;
- m_lastUpdate = 0;
- m_suspended = false;
- m_hat = NOTSET;
- p_category = NULL;
- p_stateHookup.prev = 0;
- p_stateHookup.next = 0;
if (failed)
p_stateSet = getModel()->getFailedActionSet();
else