X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b6ea5d53f8723ba9befc4a8308b8f04b05bb288b..ffbe55360efde07c787741f05fe6410860c651fa:/src/surf/sg_platf.cpp

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index d6c3aaa3cd..6d42adc875 100644
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -74,58 +74,36 @@ void sg_platf_exit() {
 }
 
 /** @brief Add an host to the current AS */
-void sg_platf_new_host(sg_platf_host_cbarg_t host)
+void sg_platf_new_host(sg_platf_host_cbarg_t args)
 {
-  simgrid::kernel::routing::AsImpl* current_routing = routing_get_current();
-
-  simgrid::s4u::Host* h = new simgrid::s4u::Host(host->id);
-  current_routing->attachHost(h);
-
-  if (host->coord && strcmp(host->coord, "")) {
-    unsigned int cursor;
-    char*str;
-
-    xbt_assert(COORD_HOST_LEVEL, "To use host coordinates, please add --cfg=network/coordinates:yes to your command line");
-    /* Pre-parse the host coordinates -- FIXME factorize with routers by overloading the routing->parse_PU function*/
-    xbt_dynar_t ctn_str = xbt_str_split_str(host->coord, " ");
-    xbt_assert(xbt_dynar_length(ctn_str)==3,"Coordinates of %s must have 3 dimensions", host->id);
-
-    xbt_dynar_t ctn = xbt_dynar_new(sizeof(double),nullptr);
-    xbt_dynar_foreach(ctn_str,cursor, str) {
-      double val = xbt_str_parse_double(str, "Invalid coordinate: %s");
-      xbt_dynar_push(ctn,&val);
-    }
-    xbt_dynar_free(&ctn_str);
-    xbt_dynar_shrink(ctn, 0);
-    h->extension_set(COORD_HOST_LEVEL, (void *) ctn);
-  }
-
-  simgrid::surf::Cpu *cpu = surf_cpu_model_pm->createCpu( h, &host->speed_per_pstate, host->core_amount);
-  if (host->state_trace)
-    cpu->setStateTrace(host->state_trace);
-  if (host->speed_trace)
-    cpu->setSpeedTrace(host->speed_trace);
-
-  new simgrid::surf::HostImpl(h, mount_list);
-  xbt_lib_set(storage_lib, host->id, ROUTING_STORAGE_HOST_LEVEL, static_cast<void*>(mount_list));
+  simgrid::s4u::Host* host = routing_get_current()->createHost(args->id, &args->speed_per_pstate, args->core_amount);
 
+  new simgrid::surf::HostImpl(host, mount_list);
+  xbt_lib_set(storage_lib, args->id, ROUTING_STORAGE_HOST_LEVEL, static_cast<void*>(mount_list));
   mount_list = nullptr;
 
-  if (host->properties) {
+  if (args->properties) {
     xbt_dict_cursor_t cursor=nullptr;
     char *key,*data;
-    xbt_dict_foreach(host->properties,cursor,key,data)
-      h->setProperty(key,data);
-    xbt_dict_free(&host->properties);
+    xbt_dict_foreach (args->properties, cursor, key, data)
+      host->setProperty(key, data);
+    xbt_dict_free(&args->properties);
   }
 
-  if (host->pstate != 0)
-    cpu->setPState(host->pstate);
+  /* Change from the defaults */
+  if (args->state_trace)
+    host->pimpl_cpu->setStateTrace(args->state_trace);
+  if (args->speed_trace)
+    host->pimpl_cpu->setSpeedTrace(args->speed_trace);
+  if (args->pstate != 0)
+    host->pimpl_cpu->setPState(args->pstate);
+  if (args->coord && strcmp(args->coord, ""))
+    new simgrid::kernel::routing::vivaldi::Coords(host, args->coord);
 
-  simgrid::s4u::Host::onCreation(*h);
+  simgrid::s4u::Host::onCreation(*host);
 
   if (TRACE_is_enabled() && TRACE_needs_platform())
-    sg_instr_new_host(*h);
+    sg_instr_new_host(*host);
 }
 
 /** @brief Add a "router" to the network element list */
@@ -180,7 +158,15 @@ void sg_platf_new_link(sg_platf_link_cbarg_t link){
     names.push_back(xbt_strdup(link->id));
   }
   for (auto link_name : names) {
-    Link *l = surf_network_model->createLink(link_name, link->bandwidth, link->latency, link->policy, link->properties);
+    Link* l = surf_network_model->createLink(link_name, link->bandwidth, link->latency, link->policy);
+
+    if (link->properties) {
+      xbt_dict_cursor_t cursor = nullptr;
+      char *key, *data;
+      xbt_dict_foreach (link->properties, cursor, key, data)
+        l->setProperty(key, data);
+      xbt_dict_free(&link->properties);
+    }
 
     if (link->latency_trace)
       l->setLatencyTrace(link->latency_trace);
@@ -249,10 +235,10 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster)
     if ((cluster->properties != nullptr) && (!xbt_dict_is_empty(cluster->properties))) {
       xbt_dict_cursor_t cursor=nullptr;
       char *key,*data;
-      host.properties = xbt_dict_new();
+      host.properties = xbt_dict_new_homogeneous(free);
 
       xbt_dict_foreach(cluster->properties,cursor,key,data) {
-        xbt_dict_set(host.properties, key, xbt_strdup(data),free);
+        xbt_dict_set(host.properties, key, xbt_strdup(data), nullptr);
       }
     }
 
@@ -437,12 +423,16 @@ void sg_platf_new_storage(sg_platf_storage_cbarg_t storage)
       storage->content_type,
     storage->properties);
 
-  surf_storage_model->createStorage(storage->id,
-                                     ((storage_type_t) stype)->type_id,
-                                     storage->content,
-                                     storage->content_type,
-                   storage->properties,
-                                     storage->attach);
+  auto s = surf_storage_model->createStorage(storage->id, ((storage_type_t)stype)->type_id, storage->content,
+                                             storage->content_type, storage->attach);
+
+  if (storage->properties) {
+    xbt_dict_cursor_t cursor = nullptr;
+    char *key, *data;
+    xbt_dict_foreach (storage->properties, cursor, key, data)
+      s->setProperty(key, data);
+    xbt_dict_free(&storage->properties);
+  }
 }
 void sg_platf_new_storage_type(sg_platf_storage_type_cbarg_t storage_type){
 
@@ -577,8 +567,7 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process)
       delete arg;
     });
   } else {                      // start_time <= SIMIX_get_clock()
-    XBT_DEBUG("Starting Process %s(%s) right now",
-      arg->name.c_str(), sg_host_get_name(host));
+    XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), host->cname());
 
     process_created = simix_global->create_process_function(
         arg->name.c_str(), std::move(code), nullptr,
@@ -778,19 +767,16 @@ simgrid::s4u::As * sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS)
       break;
   }
 
-
-  if (current_routing == nullptr && routing_platf->root_ == nullptr) { /* it is the first one */
+  if (current_routing == nullptr) { /* it is the first one */
+    xbt_assert(routing_platf->root_ == nullptr, "All defined components must belong to a AS");
     routing_platf->root_ = new_as;
 
-  } else if (current_routing != nullptr && routing_platf->root_ != nullptr) {
+  } else {
     /* set the father behavior */
     if (current_routing->hierarchy_ == simgrid::kernel::routing::AsImpl::RoutingMode::unset)
       current_routing->hierarchy_ = simgrid::kernel::routing::AsImpl::RoutingMode::recursive;
     /* add to the sons dictionary */
     xbt_dict_set(current_routing->children(), AS->id, (void *) new_as, nullptr);
-
-  } else {
-    THROWF(arg_error, 0, "All defined components must belong to a AS");
   }
 
   /* set the new current component of the tree */