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;
+surf_callback(void, simgrid::surf::VirtualMachine*) VMCreatedCallbacks;
+surf_callback(void, simgrid::surf::VirtualMachine*) VMDestructedCallbacks;
+surf_callback(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)->set_facet<simgrid::surf::Host>(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 simgrid::Host::by_name_or_null(p_subWs->getName());
}
/**********
//FIME:: handle action cancel
+}
+}