move createHost higher in the surf::HostModel hierarchy

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

diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp
index f49434e..21fd55e 100644 (file)
--- a/src/surf/host_clm03.cpp
+++ b/src/surf/host_clm03.cpp
@@ -47,14 +47,6 @@ void surf_host_model_init_compound()
 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,
-                 (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));
-  return host;
-}
-
 double HostCLM03Model::shareResources(double now){
   adjustWeightOfDummyCpuActions();
 
@@ -120,41 +112,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()
-{
-  this->die();
-}
-
-bool HostCLM03::isUsed(){
-  THROW_IMPOSSIBLE;             /* This model does not implement parallel tasks */
-  return -1;
-}
-
-void HostCLM03::updateState(tmgr_trace_event_t /*event_type*/, double /*value*/, double /*date*/){
-  THROW_IMPOSSIBLE;             /* This model does not implement parallel tasks */
-}
-
-Action *HostCLM03::execute(double size) {
-  return p_cpu->execute(size);
-}
-
-Action *HostCLM03::sleep(double duration) {
-  return p_cpu->sleep(duration);
-}
-
-e_surf_resource_state_t HostCLM03::getState() {
-  return p_cpu->getState();
-}
-
-/**********
- * Action *
- **********/
-
 }
 }