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 955331a..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()
@@ -47,16 +46,6 @@ 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,
-                 (xbt_dynar_t)xbt_lib_get_or_null(storage_lib, name, ROUTING_STORAGE_HOST_LEVEL),
-                 netElm, cpu);
-  surf_callback_emit(hostCreatedCallbacks, host);
-  XBT_DEBUG("Create host %s with %ld mounted disks", name, xbt_dynar_length(host->p_storage));
-  simgrid::Host::find_host(name)->set_facet(SURF_HOST_LEVEL, host);
-  return host;
-}
-
 double HostCLM03Model::shareResources(double now){
   adjustWeightOfDummyCpuActions();
 
@@ -95,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)
@@ -111,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
@@ -122,36 +111,5 @@ Action *HostCLM03Model::executeParallelTask(int host_nb,
   return action;
 }
 
-/************
- * Resource *
- ************/
-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) {}
-
-bool HostCLM03::isUsed(){
-  THROW_IMPOSSIBLE;             /* This model does not implement parallel tasks */
-  return -1;
-}
-
-void HostCLM03::updateState(tmgr_trace_event_t /*event_type*/, double /*value*/, double /*date*/){
-  THROW_IMPOSSIBLE;             /* This model does not implement parallel tasks */
-}
-
-Action *HostCLM03::execute(double size) {
-  return p_cpu->execute(size);
-}
-
-Action *HostCLM03::sleep(double duration) {
-  return p_cpu->sleep(duration);
-}
-
-e_surf_resource_state_t HostCLM03::getState() {
-  return p_cpu->getState();
-}
-
-/**********
- * Action *
- **********/
-
 }
 }