X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/63d18c86bbffb905a9d31dc2384596cead30529a..e88d5f7e1269acfe6576b463f476d30913e17269:/src/surf/host_clm03.cpp diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp index e18f0420c9..5a48110bc3 100644 --- a/src/surf/host_clm03.cpp +++ b/src/surf/host_clm03.cpp @@ -29,29 +29,22 @@ void surf_host_model_init_current_default(void) Model *model = surf_host_model; xbt_dynar_push(all_existing_models, &model); - xbt_dynar_push(model_list_invoke, &model); - sg_platf_host_add_cb(host_parse_init); } void surf_host_model_init_compound() { - xbt_assert(surf_cpu_model_pm, "No CPU model defined yet!"); xbt_assert(surf_network_model, "No network model defined yet!"); - surf_host_model = new HostCLM03Model(); - Model *model = surf_host_model; - xbt_dynar_push(all_existing_models, &model); - xbt_dynar_push(model_list_invoke, &model); - sg_platf_host_add_cb(host_parse_init); + surf_host_model = new HostCLM03Model(); + xbt_dynar_push(all_existing_models, &surf_host_model); } -Host *HostCLM03Model::createHost(const char *name){ - sg_host_t sg_host = sg_host_by_name(name); +Host *HostCLM03Model::createHost(const char *name,RoutingEdge *netElm, Cpu *cpu){ Host *host = new HostCLM03(surf_host_model, name, NULL, (xbt_dynar_t)xbt_lib_get_or_null(storage_lib, name, ROUTING_STORAGE_HOST_LEVEL), - sg_host_edge(sg_host), - sg_host_surfcpu(sg_host)); + netElm, cpu); + surf_callback_emit(hostCreatedCallbacks, host); XBT_DEBUG("Create host %s with %ld mounted disks", name, xbt_dynar_length(host->p_storage)); xbt_lib_set(host_lib, name, SURF_HOST_LEVEL, host); return host;