[surf] tiny cleanups around the virtual machines

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

diff --git a/src/surf/vm_interface.cpp b/src/surf/virtual_machine.cpp
similarity index 74%
rename from src/surf/vm_interface.cpp
rename to src/surf/virtual_machine.cpp
index b50057f..8f38911 100644 (file)
--- a/src/surf/vm_interface.cpp
+++ b/src/surf/virtual_machine.cpp
@@ -5,7 +5,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "cpu_cas01.hpp"
-#include "vm_interface.hpp"
+#include "virtual_machine.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_vm, surf,
                                 "Logging specific to the SURF VM module");
@@ -16,9 +16,9 @@ VMModel *surf_vm_model = NULL;
  * Callbacks *
  *************/
 
-surf_callback(void, VM*) VMCreatedCallbacks;
-surf_callback(void, VM*) VMDestructedCallbacks;
-surf_callback(void, VM*) VMStateChangedCallbacks;
+surf_callback(void, VirtualMachine*) VMCreatedCallbacks;
+surf_callback(void, VirtualMachine*) VMDestructedCallbacks;
+surf_callback(void, VirtualMachine*) VMStateChangedCallbacks;
 
 /*********
  * Model *
@@ -30,11 +30,14 @@ VMModel::vm_list_t VMModel::ws_vms;
  * Resource *
  ************/
 
-VM::VM(Model *model, const char *name, xbt_dict_t props,
+VirtualMachine::VirtualMachine(Model *model, const char *name, xbt_dict_t props,
                        RoutingEdge *netElm, Cpu *cpu)
 : Host(model, name, props, NULL, netElm, cpu)
 {
   VMModel::ws_vms.push_back(*this);
+
+  xbt_lib_set(host_lib, name, SURF_HOST_LEVEL, this);
+
   surf_callback_emit(VMCreatedCallbacks, this);
 }
 
@@ -42,13 +45,13 @@ VM::VM(Model *model, const char *name, xbt_dict_t props,
  * A physical host does not disappear in the current SimGrid code, but a VM may
  * disappear during a simulation.
  */
-VM::~VM()
+VirtualMachine::~VirtualMachine()
 {
   surf_callback_emit(VMDestructedCallbacks, this);
   VMModel::ws_vms.erase(VMModel::vm_list_t::s_iterator_to(*this));
 }
 
-void VM::setState(e_surf_resource_state_t state){
+void VirtualMachine::setState(e_surf_resource_state_t state){
   Resource::setState(state);
   surf_callback_emit(VMStateChangedCallbacks, this);
 }
@@ -57,7 +60,7 @@ void VM::setState(e_surf_resource_state_t state){
  * A surf level object will be useless in the upper layer. Returning the
  * dict_elm of the host.
  **/
-surf_resource_t VM::getPm()
+surf_resource_t VirtualMachine::getPm()
 {
   return xbt_lib_get_elm_or_null(host_lib, p_subWs->getName());
 }