X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f8890e934eccb4cc07766065689b885068d6bc65..3622a9c058d91313ef3d2bf6af1b54ab5f4786f8:/src/surf/host_clm03.cpp diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp index 3465f78b85..f0c3459de9 100644 --- a/src/surf/host_clm03.cpp +++ b/src/surf/host_clm03.cpp @@ -47,8 +47,8 @@ void surf_host_model_init_compound() namespace simgrid { namespace surf { -Host *HostCLM03Model::createHost(const char *name,RoutingEdge *netElm, Cpu *cpu){ - Host *host = new simgrid::surf::HostCLM03(surf_host_model, name, NULL, +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)); @@ -126,6 +126,10 @@ Action *HostCLM03Model::executeParallelTask(int host_nb, 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() +{ +} + bool HostCLM03::isUsed(){ THROW_IMPOSSIBLE; /* This model does not implement parallel tasks */ return -1; @@ -143,10 +147,6 @@ Action *HostCLM03::sleep(double duration) { return p_cpu->sleep(duration); } -e_surf_resource_state_t HostCLM03::getState() { - return p_cpu->getState(); -} - /********** * Action * **********/