X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7b1fb02d6a252c499432b7c90e2d08d5da05b66e..7ff60387c9140b46ec6bbcefe3897e9238bca79d:/src/surf/host_clm03.cpp

diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp
index e7151dbfcc..2987833074 100644
--- a/src/surf/host_clm03.cpp
+++ b/src/surf/host_clm03.cpp
@@ -26,13 +26,12 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host);
 
 void surf_host_model_init_current_default(void)
 {
-  surf_host_model = new HostCLM03Model();
+  surf_host_model = new simgrid::surf::HostCLM03Model();
   xbt_cfg_setdefault_boolean(_sg_cfg_set, "network/crosstraffic", "yes");
   surf_cpu_model_init_Cas01();
   surf_network_model_init_LegrandVelho();
 
-  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()
@@ -40,19 +39,12 @@ 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();
+  surf_host_model = new simgrid::surf::HostCLM03Model();
   xbt_dynar_push(all_existing_models, &surf_host_model);
 }
 
-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),
-		  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;
-}
+namespace simgrid {
+namespace surf {
 
 double HostCLM03Model::shareResources(double now){
   adjustWeightOfDummyCpuActions();
@@ -89,11 +81,11 @@ Action *HostCLM03Model::executeParallelTask(int host_nb,
   Action *action =NULL;
   if ((host_nb == 1)
       && (cost_or_zero(bytes_amount, 0) == 0.0)){
-    action = surf_host_execute(host_list[0],flops_amount[0]);
+    action = host_list[0]->pimpl_cpu->execute(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]->pimpl_netcard,
+    		                                 host_list[0]->pimpl_netcard,
 											 bytes_amount[0], rate);
   } else if ((host_nb == 2)
              && (cost_or_zero(flops_amount, 0) == 0.0)
@@ -108,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]->pimpl_netcard,
+    		                                   host_list[1]->pimpl_netcard,
 											   value, rate);
     }
   } else
@@ -119,33 +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 *
- **********/