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

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index 0e8dce3f45..e3379c9faa 100644
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -3,6 +3,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include "simgrid/Exception.hpp"
 #include "simgrid/kernel/routing/ClusterZone.hpp"
 #include "simgrid/kernel/routing/DijkstraZone.hpp"
 #include "simgrid/kernel/routing/DragonflyZone.hpp"
@@ -100,9 +101,9 @@ simgrid::kernel::routing::NetPoint* sg_platf_new_router(std::string name, const
   xbt_assert(nullptr == simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(name),
              "Refusing to create a router named '%s': this name already describes a node.", name.c_str());
 
-  simgrid::kernel::routing::NetPoint* netpoint =
-      new simgrid::kernel::routing::NetPoint(name, simgrid::kernel::routing::NetPoint::Type::Router, current_routing);
-  XBT_DEBUG("Router '%s' has the id %u", name.c_str(), netpoint->id());
+  simgrid::kernel::routing::NetPoint* netpoint = new simgrid::kernel::routing::NetPoint(
+      std::move(name), simgrid::kernel::routing::NetPoint::Type::Router, current_routing);
+  XBT_DEBUG("Router '%s' has the id %u", netpoint->get_cname(), netpoint->id());
 
   if (coords && strcmp(coords, ""))
     new simgrid::kernel::routing::vivaldi::Coords(netpoint, coords);
@@ -111,31 +112,31 @@ simgrid::kernel::routing::NetPoint* sg_platf_new_router(std::string name, const
   return netpoint;
 }
 
-void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link)
+static void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link, const std::string& link_name)
 {
-  std::vector<std::string> names;
+  simgrid::kernel::resource::LinkImpl* l =
+      surf_network_model->create_link(link_name, link->bandwidth, link->latency, link->policy);
 
-  if (link->policy == simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX) {
-    names.push_back(link->id+ "_UP");
-    names.push_back(link->id+ "_DOWN");
-  } else {
-    names.push_back(link->id);
+  if (link->properties) {
+    for (auto const& elm : *link->properties)
+      l->set_property(elm.first, elm.second);
   }
-  for (auto const& link_name : names) {
-    simgrid::kernel::resource::LinkImpl* l =
-        surf_network_model->create_link(link_name, link->bandwidth, link->latency, link->policy);
 
-    if (link->properties) {
-      for (auto const& elm : *link->properties)
-        l->set_property(elm.first, elm.second);
-    }
+  if (link->latency_trace)
+    l->set_latency_profile(link->latency_trace);
+  if (link->bandwidth_trace)
+    l->set_bandwidth_profile(link->bandwidth_trace);
+  if (link->state_trace)
+    l->set_state_profile(link->state_trace);
+}
 
-    if (link->latency_trace)
-      l->set_latency_profile(link->latency_trace);
-    if (link->bandwidth_trace)
-      l->set_bandwidth_profile(link->bandwidth_trace);
-    if (link->state_trace)
-      l->set_state_profile(link->state_trace);
+void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link)
+{
+  if (link->policy == simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX) {
+    sg_platf_new_link(link, link->id + "_UP");
+    sg_platf_new_link(link, link->id + "_DOWN");
+  } else {
+    sg_platf_new_link(link, link->id);
   }
   delete link->properties;
 }
@@ -451,11 +452,11 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor)
     arg = new simgrid::kernel::actor::ProcessArg(actor_name, code, nullptr, host, kill_time, properties, auto_restart);
 
     XBT_DEBUG("Process %s@%s will be started at time %f", arg->name.c_str(), arg->host->get_cname(), start_time);
-    SIMIX_timer_set(start_time, [arg, auto_restart]() {
-      smx_actor_t actor = SIMIX_process_create(arg->name.c_str(), std::move(arg->code), arg->data, arg->host,
-                                               arg->properties.get(), nullptr);
+    simgrid::simix::Timer::set(start_time, [arg, auto_restart]() {
+      simgrid::kernel::actor::ActorImplPtr actor = simgrid::kernel::actor::ActorImpl::create(
+          arg->name.c_str(), std::move(arg->code), arg->data, arg->host, arg->properties.get(), nullptr);
       if (arg->kill_time >= 0)
-        simcall_process_set_kill_time(actor, arg->kill_time);
+        actor->set_kill_time(arg->kill_time);
       if (auto_restart)
         actor->set_auto_restart(auto_restart);
       delete arg;
@@ -463,13 +464,17 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor)
   } else {                      // start_time <= SIMIX_get_clock()
     XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), host->get_cname());
 
-    smx_actor_t actor =
-        SIMIX_process_create(arg->name.c_str(), std::move(code), nullptr, host, arg->properties.get(), nullptr);
-
+    simgrid::kernel::actor::ActorImplPtr actor = nullptr;
+    try {
+      actor = simgrid::kernel::actor::ActorImpl::create(arg->name.c_str(), std::move(code), nullptr, host,
+                                                        arg->properties.get(), nullptr);
+    } catch (simgrid::HostFailureException const&) {
+      XBT_WARN("Deployment includes some initially turned off Hosts ... nevermind.");
+    }
     /* The actor creation will fail if the host is currently dead, but that's fine */
     if (actor != nullptr) {
       if (arg->kill_time >= 0)
-        simcall_process_set_kill_time(actor, arg->kill_time);
+        actor->set_kill_time(arg->kill_time);
       if (auto_restart)
         actor->set_auto_restart(auto_restart);
     }