X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/afb806d0615c22ac119575596b71691f4e2bc9d1..10f32e547af21144c3bda7915005b12ada659e18:/src/instr/instr_paje_containers.cpp diff --git a/src/instr/instr_paje_containers.cpp b/src/instr/instr_paje_containers.cpp index f9606bd78b..31f825e466 100644 --- a/src/instr/instr_paje_containers.cpp +++ b/src/instr/instr_paje_containers.cpp @@ -60,19 +60,19 @@ container_t PJ_container_new (const char *name, e_container_types kind, containe //Search for network_element_t switch (kind){ case INSTR_HOST: - newContainer->net_elm = sg_host->pimpl_netcard; - if(!newContainer->net_elm) xbt_die("Element '%s' not found",name); + newContainer->netcard = sg_host->pimpl_netcard; + if(!newContainer->netcard) xbt_die("Element '%s' not found",name); break; case INSTR_ROUTER: - newContainer->net_elm = (sg_netcard_t)xbt_lib_get_or_null(as_router_lib,name,ROUTING_ASR_LEVEL); - if(!newContainer->net_elm) xbt_die("Element '%s' not found",name); + newContainer->netcard = (sg_netcard_t)xbt_lib_get_or_null(as_router_lib,name,ROUTING_ASR_LEVEL); + if(!newContainer->netcard) xbt_die("Element '%s' not found",name); break; case INSTR_AS: - newContainer->net_elm = (sg_netcard_t)xbt_lib_get_or_null(as_router_lib,name,ROUTING_ASR_LEVEL); - if(!newContainer->net_elm) xbt_die("Element '%s' not found",name); + newContainer->netcard = (sg_netcard_t)xbt_lib_get_or_null(as_router_lib,name,ROUTING_ASR_LEVEL); + if(!newContainer->netcard) xbt_die("Element '%s' not found",name); break; default: - newContainer->net_elm = NULL; + newContainer->netcard = NULL; break; } @@ -135,7 +135,6 @@ container_t PJ_container_new (const char *name, e_container_types kind, containe if (newContainer->kind == INSTR_HOST || newContainer->kind == INSTR_LINK || newContainer->kind == INSTR_ROUTER) { xbt_dict_set (trivaNodeTypes, newContainer->type->name, xbt_strdup("1"), NULL); } - return newContainer; }