Kill the surf::Host subclasses (surf::HostModel remain subclassed)

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

diff --git a/src/surf/host_ptask_L07.cpp b/src/surf/host_ptask_L07.cpp
index 54b101e..f8e7b04 100644 (file)
--- a/src/surf/host_ptask_L07.cpp
+++ b/src/surf/host_ptask_L07.cpp
@@ -272,7 +272,9 @@ Action *HostL07Model::executeParallelTask(int host_nb,
 
 Host *HostL07Model::createHost(const char *name,RoutingEdge *netElm, Cpu *cpu, xbt_dict_t props)
 {
-  return new HostL07(this, name, props, netElm, cpu);
+  return new simgrid::surf::Host(this, name, props,
+                 (xbt_dynar_t)xbt_lib_get_or_null(storage_lib, name, ROUTING_STORAGE_HOST_LEVEL),
+                 netElm, cpu);
 }
 
 Action *NetworkL07Model::communicate(RoutingEdge *src, RoutingEdge *dst,
@@ -294,13 +296,6 @@ Action *NetworkL07Model::communicate(RoutingEdge *src, RoutingEdge *dst,
   return res;
 }
 
-xbt_dynar_t HostL07Model::getRoute(Host *src, Host *dst)
-{
-  xbt_dynar_t route=NULL;
-  routing_platf->getRouteAndLatency(src->p_netElm, dst->p_netElm, &route, NULL);
-  return route;
-}
-
 Cpu *CpuL07Model::createCpu(const char *name,  xbt_dynar_t powerPeak,
                           int pstate, double power_scale,
                           tmgr_trace_t power_trace, int core,
@@ -331,7 +326,7 @@ Link* NetworkL07Model::createLink(const char *name,
                                         lat_initial, lat_trace,
                                         state_initial, state_trace,
                                         policy);
-  surf_callback_emit(networkLinkCreatedCallbacks, link);
+  networkLinkCreatedCallbacks(link);
   return link;
 }
 
@@ -399,17 +394,6 @@ void HostL07Model::addTraces()
 /************
  * Resource *
  ************/
-
-HostL07::HostL07(HostModel *model, const char* name, xbt_dict_t props, RoutingEdge *netElm, Cpu *cpu)
-  : Host(model, name, props, NULL, netElm, cpu)
-{
-}
-
-HostL07::~HostL07()
-{
-  this->die();
-}
-
 CpuL07::CpuL07(CpuL07Model *model, const char* name,
                     double speedInitial, double speedScale, tmgr_trace_t speedTrace,
                           int core, e_surf_resource_state_t state_initial, tmgr_trace_t state_trace)
@@ -429,7 +413,6 @@ CpuL07::CpuL07(CpuL07Model *model, const char* name,
 
 CpuL07::~CpuL07()
 {
-  this->die();
 }
 
 LinkL07::LinkL07(NetworkL07Model *model, const char* name, xbt_dict_t props,
@@ -538,11 +521,6 @@ void LinkL07::updateState(tmgr_trace_event_t event_type, double value, double da
   return;
 }
 
-e_surf_resource_state_t HostL07::getState() {
-  return p_cpu->getState();
-}
-
-
 double LinkL07::getBandwidth()
 {
   return m_bwCurrent;