From: Martin Quinson <martin.quinson@loria.fr>
Date: Thu, 7 Jan 2016 23:23:25 +0000 (+0100)
Subject: RoutingEdgeWrapper is probably the dumbest wrapper I've ever seen. Kill it
X-Git-Tag: v3_13~1311
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/05e72afb579aa4c5370ae70bd8473eb2d8e8a873

RoutingEdgeWrapper is probably the dumbest wrapper I've ever seen. Kill it
---

diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp
index 6ed29be52b..1f0589642a 100644
--- a/src/surf/surf_routing.hpp
+++ b/src/surf/surf_routing.hpp
@@ -60,7 +60,7 @@ public:
   /**
    * @brief The As constructor
    */
-  As(){};
+  As(){xbt_die("FIXME:DEADCODE");};
 
   /**
    * @brief The As destructor
@@ -119,20 +119,6 @@ private:
   char *p_name;
 };
 
-struct RoutingEdgeWrapper : public NetCard {
-public:
-  RoutingEdgeWrapper(NetCard *re) : p_re(re){}
-  ~RoutingEdgeWrapper(){}
-  int getId() {return p_re->getId();}
-  int *getIdPtr() {return p_re->getIdPtr();}
-  void setId(int id) {p_re->setId(id);}
-  char *getName() {return p_re->getName();}
-  As *getRcComponent() {return p_re->getRcComponent();}
-  e_surf_network_element_type_t getRcType() {return p_re->getRcType();}
-private:
-  NetCard *p_re;
-};
-
 /** @ingroup SURF_routing_interface
  * @brief Link of lenght 1, alongside with its source and destination. This is mainly usefull in the ns3 bindings
  */
diff --git a/src/surf/vm_hl13.cpp b/src/surf/vm_hl13.cpp
index f073423761..99b87236bc 100644
--- a/src/surf/vm_hl13.cpp
+++ b/src/surf/vm_hl13.cpp
@@ -176,7 +176,7 @@ VMHL13::VMHL13(VMModel *model, const char* name, xbt_dict_t props, sg_host_t hos
    * from the VM name, we have to make sure that the system does not call the
    * free callback for the network resource object. The network resource object
    * is still used by the physical machine. */
-  p_netElm = new RoutingEdgeWrapper(host_PM->p_netcard);
+  p_netElm = host_PM->p_netcard;
   sg_host_t host_VM = sg_host_by_name_or_create(name);
   host_VM->p_netcard = p_netElm;
 
@@ -238,25 +238,13 @@ void VMHL13::restore()
  */
 void VMHL13::migrate(sg_host_t host_dest)
 {
-   /* ind_dst_pm equals to smx_host_t */
-   Host *surfHost_dst = static_cast<Host*>(surf_host_resource_priv(host_dest));
+   Host *surfHost_dst = surf_host_resource_priv(host_dest);
    const char *vm_name = getName();
    const char *pm_name_src = p_hostPM->getName().c_str();
    const char *pm_name_dst = surfHost_dst->getName();
 
-   xbt_assert(surfHost_dst);
-
    /* update net_elm with that of the destination physical host */
-   NetCard *old_net_elm = p_netElm;
-   NetCard *new_net_elm = new RoutingEdgeWrapper(sg_host_by_name(pm_name_dst)->p_netcard);
-   xbt_assert(new_net_elm);
-
-   /* Unregister the current net_elm from host_lib. Do not call the free callback. */
-   sg_host_by_name(vm_name)->p_netcard = nullptr;
-
-   /* Then, resister the new one. */
-   p_netElm = new_net_elm;
-   sg_host_by_name(vm_name)->p_netcard = p_netElm;
+   sg_host_by_name(vm_name)->p_netcard = p_netElm = sg_host_by_name(pm_name_dst)->p_netcard;
 
    p_hostPM = host_dest;
 
@@ -284,9 +272,7 @@ void VMHL13::migrate(sg_host_t host_dest)
      p_action = new_cpu_action;
    }
 
-   XBT_DEBUG("migrate VM(%s): change net_elm (%p to %p)", vm_name, old_net_elm, new_net_elm);
    XBT_DEBUG("migrate VM(%s): change PM (%s to %s)", vm_name, pm_name_src, pm_name_dst);
-   delete old_net_elm;
 }
 
 void VMHL13::setBound(double bound){