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

diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp
index e3610c2..33457c9 100644 (file)
--- a/src/surf/host_clm03.cpp
+++ b/src/surf/host_clm03.cpp
@@ -48,7 +48,7 @@ namespace simgrid {
 namespace surf {
 
 Host *HostCLM03Model::createHost(const char *name,RoutingEdge *netElm, Cpu *cpu, xbt_dict_t props){
-  Host *host = new simgrid::surf::HostCLM03(surf_host_model, name, props,
+  Host *host = new simgrid::surf::Host(surf_host_model, name, props,
                  (xbt_dynar_t)xbt_lib_get_or_null(storage_lib, name, ROUTING_STORAGE_HOST_LEVEL),
                  netElm, cpu);
   XBT_DEBUG("Create host %s with %ld mounted disks", name, xbt_dynar_length(host->p_storage));
@@ -120,23 +120,5 @@ Action *HostCLM03Model::executeParallelTask(int host_nb,
   return action;
 }
 
-/************
- * Resource *
- ************/
-HostCLM03::HostCLM03(HostModel *model, const char* name, xbt_dict_t properties, xbt_dynar_t storage, RoutingEdge *netElm, Cpu *cpu)
-  : Host(model, name, properties, storage, netElm, cpu) {}
-
-HostCLM03::~HostCLM03()
-{
-}
-
-void HostCLM03::updateState(tmgr_trace_event_t /*event_type*/, double /*value*/, double /*date*/){
-  THROW_IMPOSSIBLE;             /* This model does not implement parallel tasks */
-}
-
-/**********
- * Action *
- **********/
-
 }
 }

diff --git a/src/surf/host_clm03.hpp b/src/surf/host_clm03.hpp
index 075589c..ef4ec1c 100644 (file)
--- a/src/surf/host_clm03.hpp
+++ b/src/surf/host_clm03.hpp
@@ -22,8 +22,6 @@ namespace simgrid {
 namespace surf {
 
 class XBT_PRIVATE HostCLM03Model;
-class XBT_PRIVATE HostCLM03;
-class XBT_PRIVATE HostCLM03Action;
 
 /*********
  * Model *
@@ -45,24 +43,6 @@ public:
                                                          double rate) override;
 };
 
-/************
- * Resource *
- ************/
-
-class HostCLM03 : public Host {
-public:
-  HostCLM03(HostModel *model, const char* name, xbt_dict_t properties, xbt_dynar_t storage, RoutingEdge *netElm, Cpu *cpu);
-  ~HostCLM03();
-  void updateState(tmgr_trace_event_t event_type, double value, double date) override;
-
-  xbt_dynar_t getVms();
-};
-
-
-/**********
- * Action *
- **********/
-
 }
 }
 

diff --git a/src/surf/host_interface.hpp b/src/surf/host_interface.hpp
index 832ef5e..ee5aee3 100644 (file)
--- a/src/surf/host_interface.hpp
+++ b/src/surf/host_interface.hpp
@@ -254,6 +254,8 @@ public:
   virtual int fileMove(surf_file_t fd, const char* fullpath);
 
   bool isUsed() override {DIE_IMPOSSIBLE;} // FIXME: Host should not be a Resource
+  void updateState(tmgr_trace_event_t event_type, double value, double date) override
+    {THROW_IMPOSSIBLE;} // FIXME: Host should not be a Resource
 
 public:
   xbt_dynar_t p_storage;

diff --git a/src/surf/host_ptask_L07.cpp b/src/surf/host_ptask_L07.cpp
index 3fb1fa6..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,

diff --git a/src/surf/host_ptask_L07.hpp b/src/surf/host_ptask_L07.hpp
index 521b94f..15fb2ad 100644 (file)
--- a/src/surf/host_ptask_L07.hpp
+++ b/src/surf/host_ptask_L07.hpp
@@ -94,16 +94,6 @@ public:
  * Resource *
  ************/
 
-class HostL07 : public Host {
-public:
-  HostL07(HostModel *model, const char* name, xbt_dict_t props, RoutingEdge *netElm, Cpu *cpu)
-       : Host(model, name, props, NULL, netElm, cpu)
-       {}
-  ~HostL07()
-       {}
-  void updateState(tmgr_trace_event_t /*event_type*/, double /*value*/, double /*date*/) override {DIE_IMPOSSIBLE;};
-};
-
 class CpuL07 : public Cpu {
   friend void HostL07Model::addTraces();
   tmgr_trace_event_t p_stateEvent;