simgrid::surf::signal<void(simgrid::surf::Host*)> Host::onDestruction;
simgrid::surf::signal<void(simgrid::surf::Host*, e_surf_resource_state_t, e_surf_resource_state_t)> Host::onStateChange;
-static void host_destroy(void *h){
- static_cast<simgrid::surf::Host*>(h)->destroy();
-}
-
void Host::classInit()
{
if (!EXTENSION_ID.valid()) {
- EXTENSION_ID = simgrid::Host::extension_create<simgrid::surf::Host>(host_destroy);
+ EXTENSION_ID = simgrid::Host::extension_create<simgrid::surf::Host>([](void *h) {
+ static_cast<simgrid::surf::Host*>(h)->destroy();
+ });
SURF_HOST_LEVEL = EXTENSION_ID.id(); // FIXME: KILLME
}
}
void Host::attach(simgrid::Host* host)
{
if (p_host != nullptr)
- xbt_die("Already attached to host %s", host->id().c_str());
+ xbt_die("Already attached to host %s", host->getName().c_str());
host->extension_set(this);
p_host = host;
onCreation(this);
iter != simgrid::surf::VMModel::ws_vms.end(); ++iter) {
simgrid::surf::VirtualMachine *ws_vm = &*iter;
- if (this == ws_vm->p_subWs)
+ if (this == ws_vm->p_hostPM->extension(simgrid::surf::Host::EXTENSION_ID))
xbt_dynar_push(dyn, &ws_vm);
}