remove a C-like pimple

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

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index 2f5bc3b..b05dfd7 100644 (file)
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -38,7 +38,7 @@ xbt_dict_t watched_hosts_lib;
 namespace simgrid {
 namespace surf {
 
-surf_callback(void, void) surfExitCallbacks;
+simgrid::surf::signal<void(void)> surfExitCallbacks;
 
 }
 }
@@ -302,7 +302,7 @@ void surf_init(int *argc, char **argv)
 {
   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();
@@ -316,7 +316,6 @@ 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();
   SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_storage_free);
 
   xbt_init(argc, argv);
@@ -363,7 +362,7 @@ 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);
@@ -614,34 +613,8 @@ Resource::Resource(Model *model, const char *name, e_surf_resource_state_t state
   , m_running(true), m_stateCurrent(stateInit)
 {}
 
-/** Cleanup code of the full object.
- *
- *  The destructed callbacks might need to have a fully
- *  created `Cpu` instance so they cannot be called `~Cpu()`
- *  (at this point the fields of the parents have been destroyed
- *  and the virtual methods are the ones of `Cpu`). If a `Cpu`
- *  subclass overrides any virtual method, it should call this
- *  method at the beginning of the destructor in order to trigger
- *  the callbacks in the real state of the Cpu.
- *
- *  Once the method has been called once, it becomes a noop ensuring
- *  that the callbacks are not for each class of the hierarchy.
- *
- *  A better solution would be to call a `Cpu::destroy()` method
- *  before calling the destructor and trigger the callbacks here.
- */
-void Resource::die()
-{
-  if (alive_) {
-    onDie();
-    alive_ = false;
-  }
-}
-
-void Resource::onDie() {}
 
 Resource::~Resource() {
-  this->die();
   xbt_free((void*)p_name);
 }
 
@@ -713,23 +686,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