#include "simgrid/kernel/routing/TorusZone.hpp"
#include "simgrid/kernel/routing/VivaldiZone.hpp"
#include "simgrid/s4u/Engine.hpp"
-#include "simgrid/s4u/Storage.hpp"
#include "src/include/simgrid/sg_config.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/cpu_interface.hpp"
-#include "src/surf/network_interface.hpp"
#include "src/surf/xml/platf_private.hpp"
#include <string>
/** Module management function: creates all internal data structures */
void sg_platf_init()
-{ /* Do nothing: just for symmetry of user code */
+{
+ simgrid::s4u::on_platform_created.connect(check_disk_attachment);
}
/** Module management function: frees all internal data structures */
void sg_platf_exit() {
simgrid::surf::on_cluster.disconnectSlots();
- simgrid::s4u::onPlatformCreated.disconnectSlots();
+ simgrid::s4u::on_platform_created.disconnectSlots();
/* make sure that we will reinit the models while loading the platf once reinited */
surf_parse_models_setup_already_called = 0;
/* Change from the defaults */
if (args->state_trace)
- host->pimpl_cpu->setStateTrace(args->state_trace);
+ host->pimpl_cpu->set_state_trace(args->state_trace);
if (args->speed_trace)
host->pimpl_cpu->set_speed_trace(args->speed_trace);
if (args->pstate != 0)
- host->pimpl_cpu->setPState(args->pstate);
+ host->pimpl_cpu->set_pstate(args->pstate);
if (args->coord && strcmp(args->coord, ""))
new simgrid::kernel::routing::vivaldi::Coords(host->pimpl_netpoint, args->coord);
}
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::getInstance()->getNetpointByNameOrNull(name),
+ 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 =
{
std::vector<std::string> names;
- if (link->policy == SURF_LINK_SPLITDUPLEX) {
+ 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);
}
for (auto const& link_name : names) {
- simgrid::surf::LinkImpl* l =
+ simgrid::kernel::resource::LinkImpl* l =
surf_network_model->createLink(link_name, link->bandwidth, link->latency, link->policy);
if (link->properties) {
for (auto const& elm : *link->properties)
- l->setProperty(elm.first, elm.second);
+ l->set_property(elm.first, elm.second);
}
if (link->latency_trace)
// other columns are to store one or more link for the node
//add a loopback link
- simgrid::surf::LinkImpl* linkUp = nullptr;
- simgrid::surf::LinkImpl* linkDown = nullptr;
+ simgrid::kernel::resource::LinkImpl* linkUp = nullptr;
+ simgrid::kernel::resource::LinkImpl* linkDown = nullptr;
if(cluster->loopback_bw > 0 || cluster->loopback_lat > 0){
std::string tmp_link = link_id + "_loopback";
XBT_DEBUG("<loopback\tid=\"%s\"\tbw=\"%f\"/>", tmp_link.c_str(), cluster->loopback_bw);
link.id = tmp_link;
link.bandwidth = cluster->loopback_bw;
link.latency = cluster->loopback_lat;
- link.policy = SURF_LINK_FATPIPE;
+ link.policy = simgrid::s4u::Link::SharingPolicy::FATPIPE;
sg_platf_new_link(&link);
- linkUp = simgrid::surf::LinkImpl::byName(tmp_link);
- linkDown = simgrid::surf::LinkImpl::byName(tmp_link);
+ linkUp = simgrid::kernel::resource::LinkImpl::byName(tmp_link);
+ linkDown = simgrid::kernel::resource::LinkImpl::byName(tmp_link);
auto* as_cluster = static_cast<ClusterZone*>(current_as);
as_cluster->private_links_.insert({as_cluster->node_pos(rankId), {linkUp, linkDown}});
link.id = tmp_link;
link.bandwidth = cluster->limiter_link;
link.latency = 0;
- link.policy = SURF_LINK_SHARED;
+ link.policy = simgrid::s4u::Link::SharingPolicy::SHARED;
sg_platf_new_link(&link);
- linkDown = simgrid::surf::LinkImpl::byName(tmp_link);
+ linkDown = simgrid::kernel::resource::LinkImpl::byName(tmp_link);
linkUp = linkDown;
current_as->private_links_.insert({current_as->node_pos_with_loopback(rankId), {linkUp, linkDown}});
}
XBT_DEBUG("<link\tid=\"%s\" bw=\"%f\" lat=\"%f\"/>", link.id.c_str(), cluster->bb_bw, cluster->bb_lat);
sg_platf_new_link(&link);
- routing_cluster_add_backbone(simgrid::surf::LinkImpl::byName(link.id));
+ routing_cluster_add_backbone(simgrid::kernel::resource::LinkImpl::byName(link.id));
}
XBT_DEBUG("</AS>");
delete cluster->radicals;
}
-void routing_cluster_add_backbone(simgrid::surf::LinkImpl* bb)
+void routing_cluster_add_backbone(simgrid::kernel::resource::LinkImpl* bb)
{
simgrid::kernel::routing::ClusterZone* cluster =
dynamic_cast<simgrid::kernel::routing::ClusterZone*>(current_routing);
sg_platf_new_host(&host);
simgrid::kernel::routing::LinkCreationArgs link;
- link.policy = SURF_LINK_SPLITDUPLEX;
+ link.policy = simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX;
link.latency = cabinet->lat;
link.bandwidth = cabinet->bw;
link.id = "link_" + hostname;
if (storage->properties) {
for (auto const& elm : *storage->properties)
- s->setProperty(elm.first, elm.second);
+ s->set_property(elm.first, elm.second);
delete storage->properties;
}
}
if (mount_list.empty())
XBT_DEBUG("Create a Mount list for %s", A_surfxml_host_id);
- mount_list.insert({mount->name, simgrid::s4u::Engine::getInstance()->storageByName(mount->storageId)->getImpl()});
+ mount_list.insert({mount->name, simgrid::s4u::Engine::get_instance()->storage_by_name(mount->storageId)->getImpl()});
}
void sg_platf_new_route(simgrid::kernel::routing::RouteCreationArgs* route)
std::string msg = std::string("Cannot create actor '") + actor->function + "': host '" + actor->host +
"' does not exist\nExisting hosts: '";
- std::vector<simgrid::s4u::Host*> list = simgrid::s4u::Engine::getInstance()->getAllHosts();
+ std::vector<simgrid::s4u::Host*> list = simgrid::s4u::Engine::get_instance()->get_all_hosts();
for (auto const& host : list) {
msg += host->get_name();
/* Change from the defaults */
if (peer->state_trace)
- host->pimpl_cpu->setStateTrace(peer->state_trace);
+ host->pimpl_cpu->set_state_trace(peer->state_trace);
if (peer->speed_trace)
host->pimpl_cpu->set_speed_trace(peer->speed_trace);
}
-void sg_platf_begin() { /* Do nothing: just for symmetry of user code */ }
-
-void sg_platf_end() {
- simgrid::s4u::onPlatformCreated();
-}
-
/* Pick the right models for CPU, net and host, and call their model_init_preparse */
static void surf_config_models_setup()
{
- std::string host_model_name = xbt_cfg_get_string("host/model");
- std::string network_model_name = xbt_cfg_get_string("network/model");
- std::string cpu_model_name = xbt_cfg_get_string("cpu/model");
- std::string storage_model_name = xbt_cfg_get_string("storage/model");
+ std::string host_model_name = simgrid::config::get_value<std::string>("host/model");
+ 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 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 xbt_cfg_is_default_value("network/model") || not xbt_cfg_is_default_value("cpu/model")) &&
- xbt_cfg_is_default_value("host/model")) {
+ if ((not simgrid::config::is_default("network/model") || not simgrid::config::is_default("cpu/model")) &&
+ simgrid::config::is_default("host/model")) {
host_model_name = "compound";
- xbt_cfg_set_string("host/model", host_model_name.c_str());
+ simgrid::config::set_value("host/model", host_model_name);
}
XBT_DEBUG("host model: %s", host_model_name.c_str());
simgrid::s4u::NetZone* sg_platf_new_Zone_begin(simgrid::kernel::routing::ZoneCreationArgs* zone)
{
if (not surf_parse_models_setup_already_called) {
+ simgrid::s4u::on_platform_creation();
+
/* Initialize the surf models. That must be done after we got all config, and before we need the models.
* That is, after the last <config> tag, if any, and before the first of cluster|peer|AS|trace|trace_connect
*
}
if (current_routing == nullptr) { /* it is the first one */
- xbt_assert(simgrid::s4u::Engine::getInstance()->pimpl->netRoot_ == nullptr,
- "All defined components must belong to a networking zone.");
- simgrid::s4u::Engine::getInstance()->pimpl->netRoot_ = new_zone;
-
+ simgrid::s4u::Engine::get_instance()->set_netzone_root(new_zone);
} else {
/* set the father behavior */
if (current_routing->hierarchy_ == simgrid::kernel::routing::NetZoneImpl::RoutingMode::unset)
/* set the new current component of the tree */
current_routing = new_zone;
-
simgrid::s4u::NetZone::onCreation(*new_zone); // notify the signal
return new_zone;
xbt_assert(current_routing, "Cannot seal the current AS: none under construction");
current_routing->seal();
simgrid::s4u::NetZone::onSeal(*current_routing);
- current_routing = static_cast<simgrid::kernel::routing::NetZoneImpl*>(current_routing->getFather());
+ current_routing = static_cast<simgrid::kernel::routing::NetZoneImpl*>(current_routing->get_father());
}
/** @brief Add a link connecting an host to the rest of its AS (which must be cluster or vivaldi) */
xbt_assert(dynamic_cast<simgrid::kernel::routing::ClusterZone*>(current_routing),
"Only hosts from Cluster and Vivaldi ASes can get an host_link.");
- simgrid::surf::LinkImpl* linkUp = simgrid::surf::LinkImpl::byName(hostlink->link_up);
- simgrid::surf::LinkImpl* linkDown = simgrid::surf::LinkImpl::byName(hostlink->link_down);
+ simgrid::kernel::resource::LinkImpl* linkUp = simgrid::kernel::resource::LinkImpl::byName(hostlink->link_up);
+ simgrid::kernel::resource::LinkImpl* linkDown = simgrid::kernel::resource::LinkImpl::byName(hostlink->link_down);
xbt_assert(linkUp, "Link '%s' not found!", hostlink->link_up.c_str());
xbt_assert(linkDown, "Link '%s' not found!", hostlink->link_down.c_str());
