Merge lmm into base to avoid diamond inheritance

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

diff --git a/src/surf/vm_workstation_interface.cpp b/src/surf/vm_workstation_interface.cpp
index 5b66145..7572e71 100644 (file)
--- a/src/surf/vm_workstation_interface.cpp
+++ b/src/surf/vm_workstation_interface.cpp
@@ -24,12 +24,6 @@ WorkstationVMModel::WorkstationVMModel() : WorkstationModel("Virtual Workstation
  * Resource *
  ************/
 
-
-WorkstationVMLmm::WorkstationVMLmm(RoutingEdgePtr netElm, CpuPtr cpu)
-  : WorkstationVM(netElm, cpu)
-  , WorkstationLmm()
-{}
-
 /*
  * A physical host does not disapper in the current SimGrid code, but a VM may
  * disapper during a simulation.
@@ -37,10 +31,10 @@ WorkstationVMLmm::WorkstationVMLmm(RoutingEdgePtr netElm, CpuPtr cpu)
 WorkstationVM::~WorkstationVM()
 {
   /* ind_phys_workstation equals to smx_host_t */
-  surf_resource_t ind_vm_workstation = xbt_lib_get_elm_or_null(host_lib, m_name);
+  surf_resource_t ind_vm_workstation = xbt_lib_get_elm_or_null(host_lib, getName());
 
   /* Before clearing the entries in host_lib, we have to pick up resources. */
-  CpuCas01LmmPtr cpu = dynamic_cast<CpuCas01LmmPtr>(
+  CpuCas01Ptr cpu = dynamic_cast<CpuCas01Ptr>(
                     static_cast<ResourcePtr>(
                              surf_cpu_resource_priv(ind_vm_workstation)));
 
@@ -50,9 +44,9 @@ WorkstationVM::~WorkstationVM()
    * Do not call xbt_lib_remove() here. It deletes all levels of the key,
    * including MSG_HOST_LEVEL and others. We should unregister only what we know.
    */
-  xbt_lib_unset(host_lib, m_name, SURF_CPU_LEVEL, 0);
-  xbt_lib_unset(host_lib, m_name, ROUTING_HOST_LEVEL, 0);
-  xbt_lib_unset(host_lib, m_name, SURF_WKS_LEVEL, 0);
+  xbt_lib_unset(host_lib, getName(), SURF_CPU_LEVEL, 0);
+  xbt_lib_unset(host_lib, getName(), ROUTING_HOST_LEVEL, 0);
+  xbt_lib_unset(host_lib, getName(), SURF_WKS_LEVEL, 0);
 
   /* TODO: comment out when VM stroage is implemented. */
   // xbt_lib_unset(host_lib, name, SURF_STORAGE_LEVEL, 0);
@@ -72,7 +66,7 @@ WorkstationVM::~WorkstationVM()
  **/
 surf_resource_t WorkstationVM::getPm()
 {
-  return xbt_lib_get_elm_or_null(host_lib, p_subWs->m_name);
+  return xbt_lib_get_elm_or_null(host_lib, p_subWs->getName());
 }
 
 /**********