don't convert host to name to host. Perl epoch is over.

[simgrid.git] / src / surf / sg_platf.cpp

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index 19d8243..e1971f0 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -89,7 +89,7 @@ static std::vector<int> *explodesRadical(const char*radicals){
 
 /** The current AS in the parsing */
 static simgrid::kernel::routing::AsImpl *current_routing = nullptr;
-static simgrid::kernel::routing::AsImpl* routing_get_current()
+static simgrid::kernel::routing::AsImpl *routing_get_current()
 {
   return current_routing;
 }
@@ -310,7 +310,8 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster)
 
     XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%f\"\tlat=\"%f\"/>", link_id, cluster->bw, cluster->lat);
 
-    s_surf_parsing_link_up_down_t info_lim, info_loop;
+    s_surf_parsing_link_up_down_t info_lim;
+    s_surf_parsing_link_up_down_t info_loop;
     // All links are saved in a matrix;
     // every row describes a single node; every node may have multiple links.
     // the first column may store a link from x to x if p_has_loopback is set
@@ -328,10 +329,12 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster)
       link.latency   = cluster->loopback_lat;
       link.policy    = SURF_LINK_FATPIPE;
       sg_platf_new_link(&link);
-      info_loop.linkUp = info_loop.linkDown = Link::byName(tmp_link);
+      info_loop.linkUp = Link::byName(tmp_link);
+      info_loop.linkDown = Link::byName(tmp_link);
       free(tmp_link);
+
       auto as_cluster = static_cast<AsCluster*>(current_as);
-      xbt_dynar_set(as_cluster->privateLinks_, rankId*as_cluster->linkCountPerNode_, &info_loop);
+      as_cluster->privateLinks_.insert({rankId*as_cluster->linkCountPerNode_, info_loop});
     }
 
     //add a limiter link (shared link to account for maximal bandwidth of the node)
@@ -347,12 +350,13 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster)
       sg_platf_new_link(&link);
       info_lim.linkUp = info_lim.linkDown = Link::byName(tmp_link);
       free(tmp_link);
-      xbt_dynar_set(current_as->privateLinks_, rankId * current_as->linkCountPerNode_ + current_as->hasLoopback_ , &info_lim);
+      current_as->privateLinks_.insert(
+          {rankId * current_as->linkCountPerNode_ + current_as->hasLoopback_ , info_lim});
     }
 
     //call the cluster function that adds the others links
     if (cluster->topology == SURF_CLUSTER_FAT_TREE) {
-      ((AsClusterFatTree*) current_as)->addProcessingNode(i);
+      static_cast<AsClusterFatTree*>(current_as)->addProcessingNode(i);
     }
     else {
       current_as->create_links_for_node(cluster, i, rankId,
@@ -588,13 +592,11 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process)
   arg->name = std::string(process->argv[0]);
   arg->code = code;
   arg->data = nullptr;
-  arg->hostname = sg_host_get_name(host);
+  arg->host = host;
   arg->kill_time = kill_time;
   arg->properties = current_property_set;
-  if (!sg_host_simix(host)->boot_processes)
-    sg_host_simix(host)->boot_processes = xbt_dynar_new(sizeof(smx_process_arg_t), _SIMIX_host_free_process_arg);
 
-  xbt_dynar_push_as(sg_host_simix(host)->boot_processes,smx_process_arg_t,arg);
+  sg_host_simix(host)->boot_processes.push_back(arg);
 
   if (start_time > SIMIX_get_clock()) {
 
@@ -602,18 +604,18 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process)
     arg->name = std::string(process->argv[0]);
     arg->code = std::move(code);
     arg->data = nullptr;
-    arg->hostname = sg_host_get_name(host);
+    arg->host = host;
     arg->kill_time = kill_time;
     arg->properties = current_property_set;
 
-    XBT_DEBUG("Process %s(%s) will be started at time %f",
-      arg->name.c_str(), arg->hostname, start_time);
+    XBT_DEBUG("Process %s@%s will be started at time %f",
+      arg->name.c_str(), arg->host->name().c_str(), start_time);
     SIMIX_timer_set(start_time, [=]() {
       simix_global->create_process_function(
                                             arg->name.c_str(),
                                             std::move(arg->code),
                                             arg->data,
-                                            arg->hostname,
+                                            arg->host,
                                             arg->kill_time,
                                             arg->properties,
                                             arg->auto_restart,
@@ -624,15 +626,10 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process)
     XBT_DEBUG("Starting Process %s(%s) right now",
       arg->name.c_str(), sg_host_get_name(host));
 
-    if (simix_global->create_process_function)
-      process_created = simix_global->create_process_function(
-          arg->name.c_str(), std::move(code), nullptr,
-          sg_host_get_name(host), kill_time,
-          current_property_set, auto_restart, nullptr);
-    else
-      process_created = simcall_process_create(
-          arg->name.c_str(), std::move(code), nullptr, sg_host_get_name(host), kill_time,
-          current_property_set,auto_restart);
+    process_created = simix_global->create_process_function(
+        arg->name.c_str(), std::move(code), nullptr,
+        host, kill_time,
+        current_property_set, auto_restart, nullptr);
 
     /* verify if process has been created (won't be the case if the host is currently dead, but that's fine) */
     if (!process_created) {
@@ -901,12 +898,11 @@ void sg_platf_new_hostlink(sg_platf_host_link_cbarg_t hostlink)
   xbt_assert(link_up_down.linkUp, "Link '%s' not found!",hostlink->link_up);
   xbt_assert(link_up_down.linkDown, "Link '%s' not found!",hostlink->link_down);
 
-  // If dynar is is greater than netcard id and if the host_link is already defined
   auto as_cluster = static_cast<simgrid::kernel::routing::AsCluster*>(current_routing);
-  if((int)xbt_dynar_length(as_cluster->privateLinks_) > netcard->id() &&
-      xbt_dynar_get_as(as_cluster->privateLinks_, netcard->id(), void*))
-  surf_parse_error("Host_link for '%s' is already defined!",hostlink->id);
+
+  if (as_cluster->privateLinks_.find(netcard->id()) != as_cluster->privateLinks_.end())
+    surf_parse_error("Host_link for '%s' is already defined!",hostlink->id);
 
   XBT_DEBUG("Push Host_link for host '%s' to position %d", netcard->name(), netcard->id());
-  xbt_dynar_set_as(as_cluster->privateLinks_, netcard->id(), s_surf_parsing_link_up_down_t, link_up_down);
+  as_cluster->privateLinks_.insert({netcard->id(), link_up_down});
 }