X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e26d84ebd86c18af7d79d4afd659e53fd62ac9eb..8ba065168ee9c196181f609e3522acfbbd863f63:/src/surf/vm_interface.cpp

diff --git a/src/surf/vm_interface.cpp b/src/surf/vm_interface.cpp
index c72689df40..b50057f507 100644
--- a/src/surf/vm_interface.cpp
+++ b/src/surf/vm_interface.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014. The SimGrid Team.
+/* Copyright (c) 2013-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -10,32 +10,28 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_vm, surf,
                                 "Logging specific to the SURF VM module");
 
-VMModelPtr surf_vm_model = NULL;
+VMModel *surf_vm_model = NULL;
 
 /*************
  * Callbacks *
  *************/
 
-surf_callback(void, VMPtr) VMCreatedCallbacks;
-surf_callback(void, VMPtr) VMDestructedCallbacks;
-surf_callback(void, VMPtr) VMStateChangedCallbacks;
+surf_callback(void, VM*) VMCreatedCallbacks;
+surf_callback(void, VM*) VMDestructedCallbacks;
+surf_callback(void, VM*) VMStateChangedCallbacks;
 
 /*********
  * Model *
  *********/
 
-VMModel::VMModel() : HostModel("Virtual Machine") {
-  p_cpuModel = surf_cpu_model_vm;
-}
-
 VMModel::vm_list_t VMModel::ws_vms;
 
 /************
  * Resource *
  ************/
 
-VM::VM(ModelPtr model, const char *name, xbt_dict_t props,
-		        RoutingEdgePtr netElm, CpuPtr cpu)
+VM::VM(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);
@@ -43,14 +39,13 @@ VM::VM(ModelPtr model, const char *name, xbt_dict_t props,
 }
 
 /*
- * A physical host does not disapper in the current SimGrid code, but a VM may
- * disapper during a simulation.
+ * A physical host does not disappear in the current SimGrid code, but a VM may
+ * disappear during a simulation.
  */
 VM::~VM()
 {
   surf_callback_emit(VMDestructedCallbacks, this);
-  VMModel::ws_vms.erase(VMModel::
-                                   vm_list_t::s_iterator_to(*this));
+  VMModel::ws_vms.erase(VMModel::vm_list_t::s_iterator_to(*this));
 }
 
 void VM::setState(e_surf_resource_state_t state){
@@ -59,7 +54,7 @@ void VM::setState(e_surf_resource_state_t state){
 }
 
 /*
- * A surf level object will be useless in the upper layer. Returing the
+ * A surf level object will be useless in the upper layer. Returning the
  * dict_elm of the host.
  **/
 surf_resource_t VM::getPm()