A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Convert xbt_cfg_is_default_value -> simgrid::config::is_default.
[simgrid.git]
/
src
/
surf
/
sg_platf.cpp
diff --git
a/src/surf/sg_platf.cpp
b/src/surf/sg_platf.cpp
index
4c2161a
..
3f290e7
100644
(file)
--- a/
src/surf/sg_platf.cpp
+++ b/
src/surf/sg_platf.cpp
@@
-113,14
+113,14
@@
void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link)
{
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) {
@@
-209,8
+209,8
@@
void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster
// 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);
@@
-219,10
+219,10
@@
void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster
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}});
@@
-239,9
+239,9
@@
void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster
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}});
}
@@
-278,7
+278,7
@@
void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster
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>");
@@
-288,7
+288,7
@@
void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster
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);
@@
-312,7
+312,7
@@
void sg_platf_new_cabinet(simgrid::kernel::routing::CabinetCreationArgs* cabinet
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;
@@
-500,16
+500,16
@@
void sg_platf_end() {
/* 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());
@@
-644,8
+644,8
@@
void sg_platf_new_hostlink(simgrid::kernel::routing::HostLinkCreationArgs* hostl
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());