objectifies the Future Event Set of trace events

[simgrid.git] / src / surf / surf_interface.cpp

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index 3f7d33a..c782e81 100644 (file)
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -27,10 +27,9 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf,
  * 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;
@@ -38,11 +37,13 @@ xbt_dict_t watched_hosts_lib;
 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 */
@@ -302,7 +303,9 @@ void surf_init(int *argc, char **argv)
 {
   XBT_DEBUG("Create all Libs");
   host_list = xbt_dict_new_homogeneous([](void*p) {
-    delete (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();
@@ -316,7 +319,7 @@ void surf_init(int *argc, char **argv)
   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);
@@ -324,8 +327,8 @@ void surf_init(int *argc, char **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);
@@ -363,15 +366,11 @@ void surf_exit(void)
   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);
-    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
@@ -590,60 +589,50 @@ void Model::updateActionsStateFull(double /*now*/, double /*delta*/)
 namespace simgrid {
 namespace surf {
 
-Resource::Resource()
-: p_name(NULL), p_model(NULL)
-{}
-
 Resource::Resource(Model *model, const char *name)
-  : Resource(model, name, SURF_RESOURCE_ON)
+  : Resource(model, name, 1/*ON*/)
 {}
 
 Resource::Resource(Model *model, const char *name, lmm_constraint_t constraint)
-  : Resource(model, name, constraint, SURF_RESOURCE_ON)
+  : Resource(model, name, constraint, 1/*ON*/)
 {}
   
-Resource::Resource(
-  Model *model, const char *name,
-  lmm_constraint_t constraint, e_surf_resource_state_t stateInit)
-  : p_name(xbt_strdup(name)), 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, e_surf_resource_state_t stateInit)
-  : p_name(xbt_strdup(name)), 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);
 }
 
-e_surf_resource_state_t Resource::getState()
-{
-  return m_stateCurrent;
-}
-
-void Resource::setState(e_surf_resource_state_t state)
-{
-  m_stateCurrent = state;
+bool Resource::isOn() {
+  return m_isOn;
 }
-
-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;
   }
 }
 
@@ -686,23 +675,11 @@ namespace surf {
 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