XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_vm, surf,
"Logging specific to the SURF VM module");
-VMModel *surf_vm_model = NULL;
+simgrid::surf::VMModel *surf_vm_model = NULL;
+
+namespace simgrid {
+namespace surf {
/*************
* Callbacks *
*************/
-surf_callback(void, VirtualMachine*) VMCreatedCallbacks;
-surf_callback(void, VirtualMachine*) VMDestructedCallbacks;
-surf_callback(void, 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 *
* Resource *
************/
-VirtualMachine::VirtualMachine(Model *model, const char *name, xbt_dict_t props,
- RoutingEdge *netElm, Cpu *cpu)
-: Host(model, name, props, NULL, netElm, cpu)
+VirtualMachine::VirtualMachine(Model *model, const char *name, xbt_dict_t props,simgrid::Host *hostPM)
+: Host(model, name, props, NULL, NULL, NULL)
+, p_hostPM(hostPM)
{
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()
-{
- return xbt_lib_get_elm_or_null(host_lib, p_subWs->getName());
+/** @brief returns the physical machine on which the VM is running **/
+sg_host_t VirtualMachine::getPm() {
+ return p_hostPM;
}
-/**********
- * Action *
- **********/
-
-//FIME:: handle action cancel
-
+}
+}