X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/59edffecb0a76e4bc29b38a7562e7179a59a8c4a..23a00833ef66ff4383394e3cac558a5232d4bd62:/src/surf/sg_platf.cpp

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index 40ae60ea81..a178aa7b45 100644
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -55,23 +55,22 @@ void sg_platf_new_host(sg_platf_host_cbarg_t host)
   xbt_assert(! sg_host_by_name(host->id),
 		     "Refusing to create a second host named '%s'.", host->id);
 
-  RoutingEdge *net = NULL;
-  As* current_routing = routing_get_current();
+  simgrid::surf::NetCard *net = NULL;
+  simgrid::surf::As* current_routing = routing_get_current();
   if (current_routing)
     net = routing_add_host(current_routing, host);
 
-  Cpu *cpu = surf_cpu_model_pm->createCpu(
-        host->id,
-        host->power_peak,
+  sg_host_t h = simgrid::Host::by_name_or_create(host->id);
+  simgrid::surf::Cpu *cpu = surf_cpu_model_pm->createCpu(
+		h,
+        host->speed_peak,
         host->pstate,
-        host->power_scale,
-        host->power_trace,
+        host->speed_scale,
+        host->speed_trace,
         host->core_amount,
         host->initial_state,
-        host->state_trace,
-        host->properties);
-  surf_host_model->createHost(host->id, net, cpu);
-
+        host->state_trace);
+  surf_host_model->createHost(host->id, net, cpu, host->properties)->attach(h);
   if (TRACE_is_enabled() && TRACE_needs_platform())
     sg_instr_new_host(host);
 }
@@ -81,7 +80,7 @@ void sg_platf_new_host(sg_platf_host_cbarg_t host)
  */
 void sg_platf_new_router(sg_platf_router_cbarg_t router)
 {
-  As* current_routing = routing_get_current();
+  simgrid::surf::As* current_routing = routing_get_current();
 
   if (current_routing->p_hierarchy == SURF_ROUTING_NULL)
     current_routing->p_hierarchy = SURF_ROUTING_BASE;
@@ -89,14 +88,12 @@ void sg_platf_new_router(sg_platf_router_cbarg_t router)
              "Reading a router, processing unit \"%s\" already exists",
              router->id);
 
-  RoutingEdge *info = new RoutingEdgeImpl(xbt_strdup(router->id),
-                                            -1,
-                                            SURF_NETWORK_ELEMENT_ROUTER,
-                                            current_routing);
+  simgrid::surf::NetCard *info = new simgrid::surf::NetCardImpl(
+    xbt_strdup(router->id), -1, SURF_NETWORK_ELEMENT_ROUTER, current_routing);
   info->setId(current_routing->parsePU(info));
   xbt_lib_set(as_router_lib, router->id, ROUTING_ASR_LEVEL, (void *) info);
   XBT_DEBUG("Having set name '%s' id '%d'", router->id, info->getId());
-  routingEdgeCreatedCallbacks(info);
+  simgrid::surf::routingEdgeCreatedCallbacks(info);
 
   if (router->coord && strcmp(router->coord, "")) {
     unsigned int cursor;
@@ -143,13 +140,10 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster)
 void sg_platf_new_storage(sg_platf_storage_cbarg_t storage)
 {
   xbt_assert(!xbt_lib_get_or_null(storage_lib, storage->id,ROUTING_STORAGE_LEVEL),
-               "Reading a storage, processing unit \"%s\" already exists", storage->id);
+               "Refusing to add a second storage named \"%s\"", storage->id);
 
-  // Verification of an existing type_id
-#ifndef NDEBUG
-  void* storage_type = xbt_lib_get_or_null(storage_type_lib, storage->type_id,ROUTING_STORAGE_TYPE_LEVEL);
-#endif
-  xbt_assert(storage_type,"Reading a storage, type id \"%s\" does not exists", storage->type_id);
+  void* stype = xbt_lib_get_or_null(storage_type_lib, storage->type_id,ROUTING_STORAGE_TYPE_LEVEL);
+  xbt_assert(stype,"No storage type '%s'", storage->type_id);
 
   XBT_DEBUG("ROUTING Create a storage name '%s' with type_id '%s' and content '%s'",
       storage->id,
@@ -161,12 +155,7 @@ void sg_platf_new_storage(sg_platf_storage_cbarg_t storage)
       ROUTING_STORAGE_LEVEL,
       (void *) xbt_strdup(storage->type_id));
 
-  void* stype = xbt_lib_get_or_null(storage_type_lib,
-                                    storage->type_id,
-                                    ROUTING_STORAGE_TYPE_LEVEL);
-  if(!stype) xbt_die("No storage type '%s'",storage->type_id);
-
-  // if storage content is not specified use the content of storage_type if exist
+  // if storage content is not specified use the content of storage_type if any
   if(!strcmp(storage->content,"") && strcmp(((storage_type_t) stype)->content,"")){
     storage->content = ((storage_type_t) stype)->content;
     storage->content_type = ((storage_type_t) stype)->content_type;
@@ -183,13 +172,13 @@ void sg_platf_new_storage(sg_platf_storage_cbarg_t storage)
       ((storage_type_t) stype)->type_id,
       storage->content,
       storage->content_type,
-      storage->properties);
+	  storage->properties);
 
   surf_storage_model->createStorage(storage->id,
                                      ((storage_type_t) stype)->type_id,
                                      storage->content,
                                      storage->content_type,
-                                     storage->properties,
+									 storage->properties,
                                      storage->attach);
 }
 void sg_platf_new_storage_type(sg_platf_storage_type_cbarg_t storage_type){