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

diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp
index e7151dbfcc..f0c3459de9 100644
--- a/src/surf/host_clm03.cpp
+++ b/src/surf/host_clm03.cpp
@@ -26,12 +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;
+  simgrid::surf::Model *model = surf_host_model;
   xbt_dynar_push(all_existing_models, &model);
 }
 
@@ -40,17 +40,18 @@ 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,
+namespace simgrid {
+namespace surf {
+
+Host *HostCLM03Model::createHost(const char *name,RoutingEdge *netElm, Cpu *cpu, xbt_dict_t props){
+  Host *host = new simgrid::surf::HostCLM03(surf_host_model, name, props,
 		  (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;
 }
 
@@ -125,6 +126,10 @@ Action *HostCLM03Model::executeParallelTask(int host_nb,
 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) {}
 
+HostCLM03::~HostCLM03()
+{
+}
+
 bool HostCLM03::isUsed(){
   THROW_IMPOSSIBLE;             /* This model does not implement parallel tasks */
   return -1;
@@ -142,10 +147,9 @@ Action *HostCLM03::sleep(double duration) {
   return p_cpu->sleep(duration);
 }
 
-e_surf_resource_state_t HostCLM03::getState() {
-  return p_cpu->getState();
-}
-
 /**********
  * Action *
  **********/
+
+}
+}