Give a p_netcard to simgrid::Host instead of relying on extensions for that

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

diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp
index 21fd55e..0f01846 100644 (file)
--- a/src/surf/host_clm03.cpp
+++ b/src/surf/host_clm03.cpp
@@ -31,8 +31,7 @@ void surf_host_model_init_current_default(void)
   surf_cpu_model_init_Cas01();
   surf_network_model_init_LegrandVelho();
 
-  simgrid::surf::Model *model = surf_host_model;
-  xbt_dynar_push(all_existing_models, &model);
+  xbt_dynar_push(all_existing_models, &surf_host_model);
 }
 
 void surf_host_model_init_compound()
@@ -85,8 +84,8 @@ Action *HostCLM03Model::executeParallelTask(int host_nb,
     action = surf_host_execute(host_list[0],flops_amount[0]);
   } else if ((host_nb == 1)
            && (cost_or_zero(flops_amount, 0) == 0.0)) {
-    action = surf_network_model->communicate(sg_host_edge(host_list[0]),
-                                                sg_host_edge(host_list[0]),
+    action = surf_network_model->communicate(host_list[0]->p_netcard,
+                                                host_list[0]->p_netcard,
                                                                                         bytes_amount[0], rate);
   } else if ((host_nb == 2)
              && (cost_or_zero(flops_amount, 0) == 0.0)
@@ -101,8 +100,8 @@ Action *HostCLM03Model::executeParallelTask(int host_nb,
       }
     }
     if (nb == 1){
-      action = surf_network_model->communicate(sg_host_edge(host_list[0]),
-                                                  sg_host_edge(host_list[1]),
+      action = surf_network_model->communicate(host_list[0]->p_netcard,
+                                                  host_list[1]->p_netcard,
                                                                                           value, rate);
     }
   } else