Public simgrid::xbt:signal<F> class

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

diff --git a/src/surf/host_interface.cpp b/src/surf/host_interface.cpp
index bc4e286..ae57db2 100644 (file)
--- a/src/surf/host_interface.cpp
+++ b/src/surf/host_interface.cpp
@@ -31,10 +31,7 @@ void host_add_traces(){
 namespace simgrid {
 namespace surf {
 
-simgrid::xbt::Extension<simgrid::Host, Host> Host::EXTENSION_ID =
-               simgrid::Host::extension_create<simgrid::surf::Host>([](void *h) {
-               static_cast<simgrid::surf::Host*>(h)->destroy();
-        });
+simgrid::xbt::Extension<simgrid::Host, Host> Host::EXTENSION_ID;
 
 /*********
  * Model *
@@ -85,11 +82,20 @@ void HostModel::adjustWeightOfDummyCpuActions()
 /************
  * Resource *
  ************/
-simgrid::surf::signal<void(simgrid::surf::Host*)> Host::onCreation;
-simgrid::surf::signal<void(simgrid::surf::Host*)> Host::onDestruction;
-simgrid::surf::signal<void(simgrid::surf::Host*)> Host::onStateChange;
+simgrid::xbt::signal<void(simgrid::surf::Host*)> Host::onCreation;
+simgrid::xbt::signal<void(simgrid::surf::Host*)> Host::onDestruction;
+simgrid::xbt::signal<void(simgrid::surf::Host*)> Host::onStateChange;
 
-Host::Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props,
+void Host::classInit()
+{
+  if (!EXTENSION_ID.valid()) {
+    EXTENSION_ID = simgrid::Host::extension_create<simgrid::surf::Host>([](void *h) {
+       static_cast<simgrid::surf::Host*>(h)->destroy();
+    });
+  }
+}
+
+Host::Host(simgrid::surf::HostModel *model, const char *name, xbt_dict_t props,
                                 xbt_dynar_t storage, Cpu *cpu)
  : Resource(model, name)
  , PropertyHolder(props)
@@ -98,7 +104,7 @@ Host::Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props,
   p_params.ramsize = 0;
 }
 
-Host::Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint,
+Host::Host(simgrid::surf::HostModel *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint,
                                         xbt_dynar_t storage, Cpu *cpu)
  : Resource(model, name, constraint)
  , PropertyHolder(props)