/* 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"
#include "src/include/simgrid/sg_config.hpp"
#include "src/include/surf/surf.hpp"
#include "src/kernel/EngineImpl.hpp"
-#include "src/simix/smx_host_private.hpp"
#include "src/simix/smx_private.hpp"
#include "src/surf/HostImpl.hpp"
#include "src/surf/xml/platf_private.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);
-XBT_PRIVATE std::map<std::string, simgrid::surf::StorageImpl*> mount_list;
+XBT_PRIVATE std::map<std::string, simgrid::kernel::resource::StorageImpl*> mount_list;
XBT_PRIVATE std::vector<std::string> known_storages;
namespace simgrid {
}
static int surf_parse_models_setup_already_called = 0;
-std::map<std::string, simgrid::surf::StorageType*> storage_types;
+std::map<std::string, simgrid::kernel::resource::StorageType*> storage_types;
/** The current AS in the parsing */
static simgrid::kernel::routing::NetZoneImpl* current_routing = nullptr;
}
/** @brief Add a "router" to the network element list */
-simgrid::kernel::routing::NetPoint* sg_platf_new_router(std::string name, const char* coords)
+simgrid::kernel::routing::NetPoint* sg_platf_new_router(const std::string& name, const char* coords)
{
- simgrid::kernel::routing::NetZoneImpl* current_routing = routing_get_current();
-
if (current_routing->hierarchy_ == simgrid::kernel::routing::NetZoneImpl::RoutingMode::unset)
current_routing->hierarchy_ = simgrid::kernel::routing::NetZoneImpl::RoutingMode::base;
xbt_assert(nullptr == simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(name),
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());
+ 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);
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;
}
xbt_assert(std::find(known_storages.begin(), known_storages.end(), storage->id) == known_storages.end(),
"Refusing to add a second storage named \"%s\"", storage->id.c_str());
- simgrid::surf::StorageType* stype;
+ simgrid::kernel::resource::StorageType* stype;
auto st = storage_types.find(storage->type_id);
if (st != storage_types.end()) {
stype = st->second;
xbt_assert(storage_types.find(storage_type->id) == storage_types.end(),
"Reading a storage type, processing unit \"%s\" already exists", storage_type->id.c_str());
- simgrid::surf::StorageType* stype =
- new simgrid::surf::StorageType(storage_type->id, storage_type->model, storage_type->content,
- storage_type->properties, storage_type->model_properties, storage_type->size);
+ simgrid::kernel::resource::StorageType* stype = new simgrid::kernel::resource::StorageType(
+ storage_type->id, storage_type->model, storage_type->content, storage_type->properties,
+ storage_type->model_properties, storage_type->size);
XBT_DEBUG("Create a storage type id '%s' with model '%s', content '%s'", storage_type->id.c_str(),
storage_type->model.c_str(), storage_type->content.c_str());
std::vector<simgrid::s4u::Host*> list = simgrid::s4u::Engine::get_instance()->get_all_hosts();
- for (auto const& host : list) {
- msg += host->get_name();
+ for (auto const& some_host : list) {
+ msg += some_host->get_name();
msg += "', '";
if (msg.length() > 1024) {
msg.pop_back(); // remove trailing quote
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]() {
+ 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)
} else { // start_time <= SIMIX_get_clock()
XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), host->get_cname());
- simgrid::kernel::actor::ActorImplPtr actor = simgrid::kernel::actor::ActorImpl::create(
- arg->name.c_str(), std::move(code), nullptr, host, arg->properties.get(), nullptr);
-
- /* The actor creation will fail if the host is currently dead, but that's fine */
- if (actor != nullptr) {
+ try {
+ simgrid::kernel::actor::ActorImplPtr new_actor = nullptr;
+ new_actor = simgrid::kernel::actor::ActorImpl::create(arg->name.c_str(), std::move(code), nullptr, host,
+ arg->properties.get(), nullptr);
+ /* The actor creation will fail if the host is currently dead, but that's fine */
if (arg->kill_time >= 0)
- actor->set_kill_time(arg->kill_time);
+ new_actor->set_kill_time(arg->kill_time);
if (auto_restart)
- actor->set_auto_restart(auto_restart);
+ new_actor->set_auto_restart(auto_restart);
+ } catch (simgrid::HostFailureException const&) {
+ XBT_WARN("Deployment includes some initially turned off Hosts ... nevermind.");
}
}
}
/** @brief Add a link connecting a host to the rest of its AS (which must be cluster or vivaldi) */
void sg_platf_new_hostlink(simgrid::kernel::routing::HostLinkCreationArgs* hostlink)
{
- simgrid::kernel::routing::NetPoint* netpoint = sg_host_by_name(hostlink->id.c_str())->pimpl_netpoint;
+ simgrid::kernel::routing::NetPoint* netpoint = simgrid::s4u::Host::by_name(hostlink->id)->pimpl_netpoint;
xbt_assert(netpoint, "Host '%s' not found!", hostlink->id.c_str());
xbt_assert(dynamic_cast<simgrid::kernel::routing::ClusterZone*>(current_routing),
"Only hosts from Cluster and Vivaldi ASes can get a host_link.");
