-/* Copyright (c) 2006-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2021. The SimGrid Team. All rights reserved. */
/* 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. */
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);
-XBT_PRIVATE std::map<std::string, simgrid::kernel::resource::StorageImpl*> mount_list;
-XBT_PRIVATE std::vector<std::string> known_storages;
-
namespace simgrid {
namespace kernel {
namespace routing {
} // namespace simgrid
static int surf_parse_models_setup_already_called = 0;
-std::map<std::string, simgrid::kernel::resource::StorageType*> storage_types;
/** The current AS in the parsing */
static simgrid::kernel::routing::NetZoneImpl* current_routing = nullptr;
/** Module management function: creates all internal data structures */
void sg_platf_init()
{
- simgrid::s4u::Engine::on_platform_created.connect(check_disk_attachment);
+ // Do nothing: just for symmetry of user code
}
/** Module management function: frees all internal data structures */
/** @brief Add a host to the current AS */
void sg_platf_new_host(const simgrid::kernel::routing::HostCreationArgs* args)
{
- std::unordered_map<std::string, std::string> props;
+ simgrid::s4u::Host* host = routing_get_current()->create_host(args->id, args->speed_per_pstate, args->core_amount);
+
if (args->properties) {
- for (auto const& elm : *args->properties)
- props.insert({elm.first, elm.second});
+ host->set_properties(*args->properties);
delete args->properties;
}
- simgrid::s4u::Host* host =
- routing_get_current()->create_host(args->id, args->speed_per_pstate, args->core_amount, &props);
-
- host->pimpl_->set_storages(mount_list);
- mount_list.clear();
-
host->pimpl_->set_disks(args->disks, host);
/* Change from the defaults */
host->set_pstate(args->pstate);
if (not args->coord.empty())
new simgrid::kernel::routing::vivaldi::Coords(host->get_netpoint(), args->coord);
+
+ simgrid::s4u::Host::on_creation(*host); // notify the signal
}
/** @brief Add a "router" to the network element list */
static void sg_platf_new_link(const simgrid::kernel::routing::LinkCreationArgs* args, const std::string& link_name)
{
- std::unordered_map<std::string, std::string> props;
- if (args->properties)
- for (auto const& elm : *args->properties)
- props.insert({elm.first, elm.second});
+ simgrid::s4u::Link* link = routing_get_current()->create_link(link_name, args->bandwidths, args->latency, args->policy);
- const simgrid::s4u::Link* link =
- routing_get_current()->create_link(link_name, args->bandwidths, args->latency, args->policy, &props);
+ if (args->properties)
+ link->set_properties(*args->properties);
simgrid::kernel::resource::LinkImpl* l = link->get_impl();
if (args->latency_trace)
simgrid::kernel::resource::DiskImpl* sg_platf_new_disk(const simgrid::kernel::routing::DiskCreationArgs* disk)
{
- simgrid::kernel::resource::DiskImpl* d = surf_disk_model->createDisk(disk->id, disk->read_bw, disk->write_bw);
+ simgrid::kernel::resource::DiskImpl* pimpl = surf_disk_model->create_disk(disk->id, disk->read_bw, disk->write_bw);
+
if (disk->properties) {
- d->set_properties(*disk->properties);
+ pimpl->set_properties(*disk->properties);
delete disk->properties;
}
- simgrid::s4u::Disk::on_creation(*d->get_iface());
- return d;
-}
-void sg_platf_new_storage(simgrid::kernel::routing::StorageCreationArgs* storage)
-{
- 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());
-
- const simgrid::kernel::resource::StorageType* stype;
- auto st = storage_types.find(storage->type_id);
- if (st != storage_types.end()) {
- stype = st->second;
- } else {
- xbt_die("No storage type '%s'", storage->type_id.c_str());
- }
-
- XBT_DEBUG("ROUTING Create a storage name '%s' with type_id '%s' and content '%s'", storage->id.c_str(),
- storage->type_id.c_str(), storage->content.c_str());
-
- known_storages.push_back(storage->id);
-
- // if storage content is not specified use the content of storage_type if any
- if (storage->content.empty() && not stype->content.empty()) {
- storage->content = stype->content;
- XBT_DEBUG("For disk '%s' content is empty, inherit the content (of type %s)", storage->id.c_str(),
- stype->id.c_str());
- }
-
- XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s' "
- "\n\t\tmodel '%s' \n\t\tcontent '%s' "
- "\n\t\tproperties '%p''\n",
- storage->id.c_str(), stype->model.c_str(), stype->id.c_str(), storage->content.c_str(),
- storage->properties);
-
- auto s = surf_storage_model->createStorage(storage->filename, storage->lineno, storage->id, stype->id,
- storage->content, storage->attach);
-
- if (storage->properties) {
- s->set_properties(*storage->properties);
- delete storage->properties;
- }
-}
-
-void sg_platf_new_storage_type(const simgrid::kernel::routing::StorageTypeCreationArgs* storage_type)
-{
- 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());
-
- auto* 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());
-
- storage_types[storage_type->id] = stype;
-}
-
-void sg_platf_new_mount(simgrid::kernel::routing::MountCreationArgs* mount)
-{
- xbt_assert(std::find(known_storages.begin(), known_storages.end(), mount->storageId) != known_storages.end(),
- "Cannot mount non-existent disk \"%s\"", mount->storageId.c_str());
-
- XBT_DEBUG("Mount '%s' on '%s'", mount->storageId.c_str(), mount->name.c_str());
-
- if (mount_list.empty())
- XBT_DEBUG("Create a Mount list for %s", A_surfxml_host_id);
- mount_list.insert({mount->name, simgrid::s4u::Engine::get_instance()->storage_by_name(mount->storageId)->get_impl()});
+ pimpl->seal();
+ simgrid::s4u::Disk::on_creation(*pimpl->get_iface());
+ return pimpl;
}
void sg_platf_new_route(simgrid::kernel::routing::RouteCreationArgs* route)
XBT_DEBUG("Process %s@%s will be started at time %f", arg->name.c_str(), arg->host->get_cname(), start_time);
simgrid::simix::Timer::set(start_time, [arg, auto_restart]() {
simgrid::kernel::actor::ActorImplPtr new_actor = simgrid::kernel::actor::ActorImpl::create(
- arg->name.c_str(), std::move(arg->code), arg->data, arg->host, arg->properties.get(), nullptr);
+ arg->name.c_str(), arg->code, arg->data, arg->host, arg->properties.get(), nullptr);
if (arg->kill_time >= 0)
new_actor->set_kill_time(arg->kill_time);
if (auto_restart)
try {
simgrid::kernel::actor::ActorImplPtr new_actor = nullptr;
- new_actor = simgrid::kernel::actor::ActorImpl::create(arg->name.c_str(), std::move(code), nullptr, host,
+ new_actor = simgrid::kernel::actor::ActorImpl::create(arg->name.c_str(), 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)
std::vector<double> speed_per_pstate;
speed_per_pstate.push_back(peer->speed);
- simgrid::s4u::Host* host = as->create_host(peer->id, speed_per_pstate, 1, nullptr);
+ simgrid::s4u::Host* host = as->create_host(peer->id, speed_per_pstate, 1);
as->set_peer_link(host->get_netpoint(), peer->bw_in, peer->bw_out, peer->coord);
host->set_state_profile(peer->state_trace);
if (peer->speed_trace)
host->set_speed_profile(peer->speed_trace);
+ simgrid::s4u::Host::on_creation(*host); // notify the signal
}
/* Pick the right models for CPU, net and host, and call their model_init_preparse */
std::string network_model_name = simgrid::config::get_value<std::string>("network/model");
std::string cpu_model_name = simgrid::config::get_value<std::string>("cpu/model");
std::string disk_model_name = simgrid::config::get_value<std::string>("disk/model");
- std::string storage_model_name = simgrid::config::get_value<std::string>("storage/model");
/* The compound host model is needed when using non-default net/cpu models */
if ((not simgrid::config::is_default("network/model") || not simgrid::config::is_default("cpu/model")) &&
XBT_DEBUG("Call disk_model_init");
int disk_id = find_model_description(surf_disk_model_description, disk_model_name);
surf_disk_model_description[disk_id].model_init_preparse();
-
- XBT_DEBUG("Call storage_model_init");
- int storage_id = find_model_description(surf_storage_model_description, storage_model_name);
- surf_storage_model_description[storage_id].model_init_preparse();
}
/**
}
/**
- * @brief Specify that the description of the current AS is finished
+ * @brief Specify that the description of the current Zone is finished
*
- * Once you've declared all the content of your AS, you have to seal
- * it with this call. Your AS is not usable until you call this function.
+ * Once you've declared all the content of your Zone, you have to seal
+ * it with this call. Your Zone is not usable until you call this function.
*/
void sg_platf_new_Zone_seal()
{
- xbt_assert(current_routing, "Cannot seal the current AS: none under construction");
+ xbt_assert(current_routing, "Cannot seal the current Zone: zone under construction");
current_routing->seal();
simgrid::s4u::NetZone::on_seal(*current_routing->get_iface());
current_routing = current_routing->get_father();
}
-/** @brief Add a link connecting a host to the rest of its AS (which must be cluster or vivaldi) */
+/** @brief Add a link connecting a host to the rest of its Zone (which must be cluster or vivaldi) */
void sg_platf_new_hostlink(const simgrid::kernel::routing::HostLinkCreationArgs* hostlink)
{
const simgrid::kernel::routing::NetPoint* netpoint = simgrid::s4u::Host::by_name(hostlink->id)->get_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.");
+ "Only hosts from Cluster and Vivaldi Zones can get a host_link.");
const simgrid::s4u::Link* linkUp = simgrid::s4u::Link::by_name_or_null(hostlink->link_up);
const simgrid::s4u::Link* linkDown = simgrid::s4u::Link::by_name_or_null(hostlink->link_down);