/** Module management function: creates all internal data structures */
void sg_platf_init()
-{ /* Do nothing: just for symmetry of user code */
+{
+ simgrid::s4u::onPlatformCreated.connect(check_disk_attachment);
}
/** Module management function: frees all internal data structures */
{
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 {
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::kernel::resource::LinkImpl::byName(tmp_link);
linkDown = simgrid::kernel::resource::LinkImpl::byName(tmp_link);
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::kernel::resource::LinkImpl::byName(tmp_link);
linkUp = linkDown;
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 (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::getInstance()->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::getInstance()->get_all_hosts();
for (auto const& host : list) {
msg += host->get_name();
/* 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());