* Callbacks *
*************/
-surf_callback(void, simgrid::surf::VirtualMachine*) VMCreatedCallbacks;
-surf_callback(void, simgrid::surf::VirtualMachine*) VMDestructedCallbacks;
-surf_callback(void, simgrid::surf::VirtualMachine*) VMStateChangedCallbacks;
+simgrid::surf::signal<void(simgrid::surf::VirtualMachine*)> VMCreatedCallbacks;
+simgrid::surf::signal<void(simgrid::surf::VirtualMachine*)> VMDestructedCallbacks;
+simgrid::surf::signal<void(simgrid::surf::VirtualMachine*)> VMStateChangedCallbacks;
/*********
* Model *
: Host(model, name, props, NULL, netElm, cpu)
{
VMModel::ws_vms.push_back(*this);
-
- xbt_lib_set(host_lib, name, SURF_HOST_LEVEL, this);
+ simgrid::Host::by_name_or_create(name)->extension_set<simgrid::surf::Host>(this);
}
/*
*/
VirtualMachine::~VirtualMachine()
{
- surf_callback_emit(VMDestructedCallbacks, this);
+ VMDestructedCallbacks(this);
VMModel::ws_vms.erase(VMModel::vm_list_t::s_iterator_to(*this));
}
void VirtualMachine::setState(e_surf_resource_state_t state){
Resource::setState(state);
- surf_callback_emit(VMStateChangedCallbacks, this);
+ VMStateChangedCallbacks(this);
}
/*
* A surf level object will be useless in the upper layer. Returning the
* dict_elm of the host.
**/
-surf_resource_t VirtualMachine::getPm()
+sg_host_t VirtualMachine::getPm()
{
- return xbt_lib_get_elm_or_null(host_lib, p_subWs->getName());
+ return p_subWs->getHost();
}
/**********