Merge branch 'master' of git+ssh://scm.gforge.inria.fr/gitroot/simgrid/simgrid

[simgrid.git] / src / instr / instr_paje_containers.cpp

diff --git a/src/instr/instr_paje_containers.cpp b/src/instr/instr_paje_containers.cpp
index e5d3c36..31f825e 100644 (file)
--- 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_edge(sg_host);
-      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;
 }