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
move some global signals to the Engine
[simgrid.git]
/
src
/
surf
/
sg_platf.cpp
diff --git
a/src/surf/sg_platf.cpp
b/src/surf/sg_platf.cpp
index
1abeb14
..
b91dbb0
100644
(file)
--- a/
src/surf/sg_platf.cpp
+++ b/
src/surf/sg_platf.cpp
@@
-19,7
+19,7
@@
#include "src/include/simgrid/sg_config.hpp"
#include "src/include/surf/surf.hpp"
#include "src/kernel/EngineImpl.hpp"
#include "src/include/simgrid/sg_config.hpp"
#include "src/include/surf/surf.hpp"
#include "src/kernel/EngineImpl.hpp"
-#include "src/
simix/smx_host_privat
e.hpp"
+#include "src/
kernel/resource/profile/Profil
e.hpp"
#include "src/simix/smx_private.hpp"
#include "src/surf/HostImpl.hpp"
#include "src/surf/xml/platf_private.hpp"
#include "src/simix/smx_private.hpp"
#include "src/surf/HostImpl.hpp"
#include "src/surf/xml/platf_private.hpp"
@@
-28,18
+28,18
@@
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);
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 {
namespace surf {
XBT_PRIVATE std::vector<std::string> known_storages;
namespace simgrid {
namespace surf {
-simgrid::xbt::signal<void(kernel::routing::ClusterCreationArgs
*
)> on_cluster;
+simgrid::xbt::signal<void(kernel::routing::ClusterCreationArgs
const&
)> on_cluster;
}
}
static int surf_parse_models_setup_already_called = 0;
}
}
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;
/** The current AS in the parsing */
static simgrid::kernel::routing::NetZoneImpl* current_routing = nullptr;
@@
-51,13
+51,13
@@
static simgrid::kernel::routing::NetZoneImpl* routing_get_current()
/** Module management function: creates all internal data structures */
void sg_platf_init()
{
/** Module management function: creates all internal data structures */
void sg_platf_init()
{
- simgrid::s4u::on_platform_created.connect(check_disk_attachment);
+ simgrid::s4u::
Engine::
on_platform_created.connect(check_disk_attachment);
}
/** Module management function: frees all internal data structures */
void sg_platf_exit() {
simgrid::surf::on_cluster.disconnect_slots();
}
/** Module management function: frees all internal data structures */
void sg_platf_exit() {
simgrid::surf::on_cluster.disconnect_slots();
- simgrid::s4u::on_platform_created.disconnect_slots();
+ simgrid::s4u::
Engine::
on_platform_created.disconnect_slots();
/* make sure that we will reinit the models while loading the platf once reinited */
surf_parse_models_setup_already_called = 0;
/* make sure that we will reinit the models while loading the platf once reinited */
surf_parse_models_setup_already_called = 0;
@@
-75,7
+75,7
@@
void sg_platf_new_host(simgrid::kernel::routing::HostCreationArgs* args)
}
simgrid::s4u::Host* host =
}
simgrid::s4u::Host* host =
- routing_get_current()->create_host(args->id,
&
args->speed_per_pstate, args->core_amount, &props);
+ routing_get_current()->create_host(args->id, args->speed_per_pstate, args->core_amount, &props);
host->pimpl_->storage_ = mount_list;
mount_list.clear();
host->pimpl_->storage_ = mount_list;
mount_list.clear();
@@
-87,20
+87,20
@@
void sg_platf_new_host(simgrid::kernel::routing::HostCreationArgs* args)
host->pimpl_cpu->set_speed_profile(args->speed_trace);
if (args->pstate != 0)
host->pimpl_cpu->set_pstate(args->pstate);
host->pimpl_cpu->set_speed_profile(args->speed_trace);
if (args->pstate != 0)
host->pimpl_cpu->set_pstate(args->pstate);
- if (
args->coord && strcmp(args->coord, ""
))
+ if (
not args->coord.empty(
))
new simgrid::kernel::routing::vivaldi::Coords(host->pimpl_netpoint, args->coord);
}
/** @brief Add a "router" to the network element list */
new simgrid::kernel::routing::vivaldi::Coords(host->pimpl_netpoint, args->coord);
}
/** @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)
{
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),
"Refusing to create a router named '%s': this name already describes a node.", name.c_str());
{
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),
"Refusing to create a router named '%s': this name already describes a node.", name.c_str());
- simgrid::kernel::routing::NetPoint* netpoint =
new simgrid::kernel::routing::NetPoint(
-
std::move(name)
, simgrid::kernel::routing::NetPoint::Type::Router, current_routing);
+ 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", netpoint->get_cname(), netpoint->id());
if (coords && strcmp(coords, ""))
XBT_DEBUG("Router '%s' has the id %u", netpoint->get_cname(), netpoint->id());
if (coords && strcmp(coords, ""))
@@
-113,11
+113,10
@@
simgrid::kernel::routing::NetPoint* sg_platf_new_router(std::string name, const
static void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link, const std::string& link_name)
{
simgrid::kernel::resource::LinkImpl* l =
static void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link, const std::string& link_name)
{
simgrid::kernel::resource::LinkImpl* l =
- surf_network_model->create_link(link_name, link->bandwidth, link->latency, link->policy);
+ surf_network_model->create_link(link_name, link->bandwidth
s
, link->latency, link->policy);
if (link->properties) {
if (link->properties) {
- for (auto const& elm : *link->properties)
- l->set_property(elm.first, elm.second);
+ l->set_properties(*link->properties);
}
if (link->latency_trace)
}
if (link->latency_trace)
@@
-168,6
+167,9
@@
void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster
sg_platf_new_Zone_begin(&zone);
simgrid::kernel::routing::ClusterZone* current_as = static_cast<ClusterZone*>(routing_get_current());
current_as->parse_specific_arguments(cluster);
sg_platf_new_Zone_begin(&zone);
simgrid::kernel::routing::ClusterZone* current_as = static_cast<ClusterZone*>(routing_get_current());
current_as->parse_specific_arguments(cluster);
+ if (cluster->properties != nullptr)
+ for (auto const& elm : *cluster->properties)
+ current_as->get_iface()->set_property(elm.first, elm.second);
if(cluster->loopback_bw > 0 || cluster->loopback_lat > 0){
current_as->num_links_per_node_++;
if(cluster->loopback_bw > 0 || cluster->loopback_lat > 0){
current_as->num_links_per_node_++;
@@
-218,7
+220,7
@@
void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster
simgrid::kernel::routing::LinkCreationArgs link;
link.id = tmp_link;
simgrid::kernel::routing::LinkCreationArgs link;
link.id = tmp_link;
- link.bandwidth
= cluster->loopback_bw
;
+ link.bandwidth
s.push_back(cluster->loopback_bw)
;
link.latency = cluster->loopback_lat;
link.policy = simgrid::s4u::Link::SharingPolicy::FATPIPE;
sg_platf_new_link(&link);
link.latency = cluster->loopback_lat;
link.policy = simgrid::s4u::Link::SharingPolicy::FATPIPE;
sg_platf_new_link(&link);
@@
-238,7
+240,7
@@
void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster
simgrid::kernel::routing::LinkCreationArgs link;
link.id = tmp_link;
simgrid::kernel::routing::LinkCreationArgs link;
link.id = tmp_link;
- link.bandwidth
= cluster->limiter_link
;
+ link.bandwidth
s.push_back(cluster->limiter_link)
;
link.latency = 0;
link.policy = simgrid::s4u::Link::SharingPolicy::SHARED;
sg_platf_new_link(&link);
link.latency = 0;
link.policy = simgrid::s4u::Link::SharingPolicy::SHARED;
sg_platf_new_link(&link);
@@
-273,7
+275,7
@@
void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster
simgrid::kernel::routing::LinkCreationArgs link;
link.id = std::string(cluster->id)+ "_backbone";
simgrid::kernel::routing::LinkCreationArgs link;
link.id = std::string(cluster->id)+ "_backbone";
- link.bandwidth
= cluster->bb_bw
;
+ link.bandwidth
s.push_back(cluster->bb_bw)
;
link.latency = cluster->bb_lat;
link.policy = cluster->bb_sharing_policy;
link.latency = cluster->bb_lat;
link.policy = cluster->bb_sharing_policy;
@@
-286,7
+288,7
@@
void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster
XBT_DEBUG("</AS>");
sg_platf_new_Zone_seal();
XBT_DEBUG("</AS>");
sg_platf_new_Zone_seal();
- simgrid::surf::on_cluster(cluster);
+ simgrid::surf::on_cluster(
*
cluster);
delete cluster->radicals;
}
delete cluster->radicals;
}
@@
-316,7
+318,7
@@
void sg_platf_new_cabinet(simgrid::kernel::routing::CabinetCreationArgs* cabinet
simgrid::kernel::routing::LinkCreationArgs link;
link.policy = simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX;
link.latency = cabinet->lat;
simgrid::kernel::routing::LinkCreationArgs link;
link.policy = simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX;
link.latency = cabinet->lat;
- link.bandwidth
= cabinet->bw
;
+ link.bandwidth
s.push_back(cabinet->bw)
;
link.id = "link_" + hostname;
sg_platf_new_link(&link);
link.id = "link_" + hostname;
sg_platf_new_link(&link);
@@
-334,7
+336,7
@@
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());
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;
auto st = storage_types.find(storage->type_id);
if (st != storage_types.end()) {
stype = st->second;
@@
-363,8
+365,7
@@
void sg_platf_new_storage(simgrid::kernel::routing::StorageCreationArgs* storage
auto s = surf_storage_model->createStorage(storage->id, stype->id, storage->content, storage->attach);
if (storage->properties) {
auto s = surf_storage_model->createStorage(storage->id, stype->id, storage->content, storage->attach);
if (storage->properties) {
- for (auto const& elm : *storage->properties)
- s->set_property(elm.first, elm.second);
+ s->set_properties(*storage->properties);
delete storage->properties;
}
}
delete storage->properties;
}
}
@@
-374,9
+375,9
@@
void sg_platf_new_storage_type(simgrid::kernel::routing::StorageTypeCreationArgs
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());
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());
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());
@@
-451,12
+452,12
@@
void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor)
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]() {
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 actor = simgrid::kernel::actor::ActorImpl::create(
+ 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);
if (arg->kill_time >= 0)
arg->name.c_str(), std::move(arg->code), arg->data, arg->host, arg->properties.get(), nullptr);
if (arg->kill_time >= 0)
- actor->set_kill_time(arg->kill_time);
+
new_
actor->set_kill_time(arg->kill_time);
if (auto_restart)
if (auto_restart)
- actor->set_auto_restart(auto_restart);
+
new_
actor->set_auto_restart(auto_restart);
delete arg;
});
} else { // start_time <= SIMIX_get_clock()
delete arg;
});
} else { // start_time <= SIMIX_get_clock()
@@
-482,9
+483,9
@@
void sg_platf_new_peer(simgrid::kernel::routing::PeerCreationArgs* peer)
simgrid::kernel::routing::VivaldiZone* as = dynamic_cast<simgrid::kernel::routing::VivaldiZone*>(current_routing);
xbt_assert(as, "<peer> tag can only be used in Vivaldi netzones.");
simgrid::kernel::routing::VivaldiZone* as = dynamic_cast<simgrid::kernel::routing::VivaldiZone*>(current_routing);
xbt_assert(as, "<peer> tag can only be used in Vivaldi netzones.");
- std::vector<double> speed
PerP
state;
- speed
PerP
state.push_back(peer->speed);
- simgrid::s4u::Host* host = as->create_host(peer->id.c_str(),
&speedPerP
state, 1, nullptr);
+ std::vector<double> speed
_per_p
state;
+ speed
_per_p
state.push_back(peer->speed);
+ simgrid::s4u::Host* host = as->create_host(peer->id.c_str(),
speed_per_p
state, 1, nullptr);
as->set_peer_link(host->pimpl_netpoint, peer->bw_in, peer->bw_out, peer->coord);
as->set_peer_link(host->pimpl_netpoint, peer->bw_in, peer->bw_out, peer->coord);
@@
-547,7
+548,7
@@
static void surf_config_models_setup()
simgrid::kernel::routing::NetZoneImpl* sg_platf_new_Zone_begin(simgrid::kernel::routing::ZoneCreationArgs* zone)
{
if (not surf_parse_models_setup_already_called) {
simgrid::kernel::routing::NetZoneImpl* sg_platf_new_Zone_begin(simgrid::kernel::routing::ZoneCreationArgs* zone)
{
if (not surf_parse_models_setup_already_called) {
- simgrid::s4u::on_platform_creation();
+ simgrid::s4u::
Engine::
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|zone|trace|trace_connect
/* 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|zone|trace|trace_connect
@@
-637,7
+638,7
@@
void sg_platf_new_Zone_seal()
/** @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)
{
/** @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 = s
g_host_by_name(hostlink->id.c_str()
)->pimpl_netpoint;
+ simgrid::kernel::routing::NetPoint* netpoint = s
imgrid::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.");
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.");