-/* Copyright (c) 2006-2014. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2006-2017. 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. */
#include "simgrid/s4u/engine.hpp"
+
#include "src/kernel/EngineImpl.hpp"
#include "src/simix/smx_private.h"
#include "src/kernel/routing/FatTreeZone.hpp"
#include "src/kernel/routing/FloydZone.hpp"
#include "src/kernel/routing/FullZone.hpp"
-#include "src/kernel/routing/NetCard.hpp"
+#include "src/kernel/routing/NetPoint.hpp"
#include "src/kernel/routing/NetZoneImpl.hpp"
#include "src/kernel/routing/TorusZone.hpp"
#include "src/kernel/routing/VivaldiZone.hpp"
-
+#include <string>
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);
-XBT_PRIVATE xbt_dynar_t mount_list = nullptr;
+XBT_PRIVATE std::vector<s_mount_t> mount_list;
namespace simgrid {
namespace surf {
simgrid::xbt::signal<void(sg_platf_cluster_cbarg_t)> on_cluster;
-simgrid::xbt::signal<void(void)> on_postparse;
}
}
/** Module management function: frees all internal data structures */
void sg_platf_exit() {
simgrid::surf::on_cluster.disconnect_all_slots();
- simgrid::surf::on_postparse.disconnect_all_slots();
+ simgrid::s4u::onPlatformCreated.disconnect_all_slots();
/* make sure that we will reinit the models while loading the platf once reinited */
surf_parse_models_setup_already_called = 0;
/** @brief Add an host to the current AS */
void sg_platf_new_host(sg_platf_host_cbarg_t args)
{
- simgrid::s4u::Host* host = routing_get_current()->createHost(args->id, &args->speed_per_pstate, args->core_amount);
-
- new simgrid::surf::HostImpl(host, mount_list);
- xbt_lib_set(storage_lib, args->id, ROUTING_STORAGE_HOST_LEVEL, static_cast<void*>(mount_list));
- mount_list = nullptr;
-
+ std::unordered_map<std::string, std::string> props;
if (args->properties) {
xbt_dict_cursor_t cursor=nullptr;
- char *key,*data;
+ char *key;
+ char* data;
xbt_dict_foreach (args->properties, cursor, key, data)
- host->setProperty(key, data);
+ props[key] = data;
xbt_dict_free(&args->properties);
}
+ simgrid::s4u::Host* host =
+ routing_get_current()->createHost(args->id, &args->speed_per_pstate, args->core_amount, &props);
+
+ host->pimpl_->storage_ = mount_list;
+ mount_list.clear();
+
/* Change from the defaults */
if (args->state_trace)
host->pimpl_cpu->setStateTrace(args->state_trace);
if (args->pstate != 0)
host->pimpl_cpu->setPState(args->pstate);
if (args->coord && strcmp(args->coord, ""))
- new simgrid::kernel::routing::vivaldi::Coords(host->pimpl_netcard, args->coord);
-
- simgrid::s4u::Host::onCreation(*host);
+ new simgrid::kernel::routing::vivaldi::Coords(host->pimpl_netpoint, args->coord);
if (TRACE_is_enabled() && TRACE_needs_platform())
sg_instr_new_host(*host);
}
/** @brief Add a "router" to the network element list */
-void sg_platf_new_router(sg_platf_router_cbarg_t router)
+simgrid::kernel::routing::NetPoint* sg_platf_new_router(const char* name, const char* coords)
{
simgrid::kernel::routing::NetZoneImpl* current_routing = routing_get_current();
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::instance()->netcardByNameOrNull(router->id),
- "Refusing to create a router named '%s': this name already describes a node.", router->id);
+ xbt_assert(nullptr == simgrid::s4u::Engine::instance()->netpointByNameOrNull(name),
+ "Refusing to create a router named '%s': this name already describes a node.", name);
- simgrid::kernel::routing::NetCard* netcard =
- new simgrid::kernel::routing::NetCard(router->id, simgrid::kernel::routing::NetCard::Type::Router, current_routing);
- XBT_DEBUG("Router '%s' has the id %d", router->id, netcard->id());
+ 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 %d", name, netpoint->id());
- if (router->coord && strcmp(router->coord, ""))
- new simgrid::kernel::routing::vivaldi::Coords(netcard, router->coord);
+ if (coords && strcmp(coords, ""))
+ new simgrid::kernel::routing::vivaldi::Coords(netpoint, coords);
- if (TRACE_is_enabled() && TRACE_needs_platform())
- sg_instr_new_router(router);
+ sg_instr_new_router(name);
+
+ return netpoint;
}
-void sg_platf_new_link(sg_platf_link_cbarg_t link){
- std::vector<char*> names;
+void sg_platf_new_link(LinkCreationArgs* link)
+{
+ std::vector<std::string> names;
if (link->policy == SURF_LINK_FULLDUPLEX) {
- names.push_back(bprintf("%s_UP", link->id));
- names.push_back(bprintf("%s_DOWN", link->id));
+ names.push_back(link->id+ "_UP");
+ names.push_back(link->id+ "_DOWN");
} else {
- names.push_back(xbt_strdup(link->id));
+ names.push_back(link->id);
}
for (auto link_name : names) {
- Link* l = surf_network_model->createLink(link_name, link->bandwidth, link->latency, link->policy);
+ simgrid::surf::LinkImpl* l =
+ surf_network_model->createLink(link_name.c_str(), link->bandwidth, link->latency, link->policy);
if (link->properties) {
xbt_dict_cursor_t cursor = nullptr;
- char *key, *data;
+ char* key;
+ char* data;
xbt_dict_foreach (link->properties, cursor, key, data)
l->setProperty(key, data);
xbt_dict_free(&link->properties);
l->setBandwidthTrace(link->bandwidth_trace);
if (link->state_trace)
l->setStateTrace(link->state_trace);
-
- xbt_free(link_name);
}
}
int rankId=0;
- s_sg_platf_link_cbarg_t link;
// What an inventive way of initializing the AS that I have as ancestor :-(
s_sg_platf_AS_cbarg_t AS;
simgrid::kernel::routing::ClusterZone* current_as = static_cast<ClusterZone*>(routing_get_current());
current_as->parse_specific_arguments(cluster);
- if(cluster->loopback_bw!=0 || cluster->loopback_lat!=0){
+ if(cluster->loopback_bw > 0 || cluster->loopback_lat > 0){
current_as->linkCountPerNode_++;
current_as->hasLoopback_ = 1;
}
- if(cluster->limiter_link!=0){
+ if(cluster->limiter_link > 0){
current_as->linkCountPerNode_++;
current_as->hasLimiter_ = 1;
}
char * host_id = bprintf("%s%d%s", cluster->prefix, i, cluster->suffix);
char * link_id = bprintf("%s_link_%d", cluster->id, i);
- XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%f\">", host_id, cluster->speed);
+ XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%f\">", host_id, cluster->speeds.front());
s_sg_platf_host_cbarg_t host;
memset(&host, 0, sizeof(host));
host.id = host_id;
if ((cluster->properties != nullptr) && (!xbt_dict_is_empty(cluster->properties))) {
xbt_dict_cursor_t cursor=nullptr;
- char *key,*data;
+ char *key;
+ char* data;
host.properties = xbt_dict_new_homogeneous(free);
xbt_dict_foreach(cluster->properties,cursor,key,data) {
}
}
- host.speed_per_pstate.push_back(cluster->speed);
+ host.speed_per_pstate = cluster->speeds;
host.pstate = 0;
host.core_amount = cluster->core_amount;
host.coord = "";
// other columns are to store one or more link for the node
//add a loopback link
- Link* linkUp = nullptr;
- Link* linkDown = nullptr;
- if(cluster->loopback_bw!=0 || cluster->loopback_lat!=0){
+ simgrid::surf::LinkImpl* linkUp = nullptr;
+ simgrid::surf::LinkImpl* linkDown = nullptr;
+ if(cluster->loopback_bw > 0 || cluster->loopback_lat > 0){
char *tmp_link = bprintf("%s_loopback", link_id);
XBT_DEBUG("<loopback\tid=\"%s\"\tbw=\"%f\"/>", tmp_link, cluster->loopback_bw);
- memset(&link, 0, sizeof(link));
+ LinkCreationArgs link;
link.id = tmp_link;
link.bandwidth = cluster->loopback_bw;
link.latency = cluster->loopback_lat;
link.policy = SURF_LINK_FATPIPE;
sg_platf_new_link(&link);
- linkUp = Link::byName(tmp_link);
- linkDown = Link::byName(tmp_link);
+ linkUp = simgrid::surf::LinkImpl::byName(tmp_link);
+ linkDown = simgrid::surf::LinkImpl::byName(tmp_link);
free(tmp_link);
auto as_cluster = static_cast<ClusterZone*>(current_as);
//add a limiter link (shared link to account for maximal bandwidth of the node)
linkUp = nullptr;
linkDown = nullptr;
- if(cluster->limiter_link!=0){
+ if(cluster->limiter_link > 0){
char *tmp_link = bprintf("%s_limiter", link_id);
XBT_DEBUG("<limiter\tid=\"%s\"\tbw=\"%f\"/>", tmp_link, cluster->limiter_link);
- memset(&link, 0, sizeof(link));
+ LinkCreationArgs link;
link.id = tmp_link;
link.bandwidth = cluster->limiter_link;
link.latency = 0;
link.policy = SURF_LINK_SHARED;
sg_platf_new_link(&link);
- linkUp = linkDown = Link::byName(tmp_link);
+ linkUp = linkDown = simgrid::surf::LinkImpl::byName(tmp_link);
free(tmp_link);
current_as->privateLinks_.insert(
{rankId * current_as->linkCountPerNode_ + current_as->hasLoopback_, {linkUp, linkDown}});
xbt_free(host_id);
rankId++;
}
+ xbt_dict_free(&cluster->properties);
// Add a router.
XBT_DEBUG(" ");
XBT_DEBUG("<router id=\"%s\"/>", cluster->router_id);
- char *newid = nullptr;
- s_sg_platf_router_cbarg_t router;
- memset(&router, 0, sizeof(router));
- router.id = cluster->router_id;
- if (!router.id || !strcmp(router.id, ""))
- router.id = newid = bprintf("%s%s_router%s", cluster->prefix, cluster->id, cluster->suffix);
- sg_platf_new_router(&router);
- current_as->router_ = simgrid::s4u::Engine::instance()->netcardByNameOrNull(router.id);
- free(newid);
+ if (!cluster->router_id || !strcmp(cluster->router_id, "")) {
+ char* newid = bprintf("%s%s_router%s", cluster->prefix, cluster->id, cluster->suffix);
+ current_as->router_ = sg_platf_new_router(newid, NULL);
+ free(newid);
+ } else {
+ current_as->router_ = sg_platf_new_router(cluster->router_id, NULL);
+ }
//Make the backbone
- if ((cluster->bb_bw != 0) || (cluster->bb_lat != 0)) {
+ if ((cluster->bb_bw > 0) || (cluster->bb_lat > 0)) {
- memset(&link, 0, sizeof(link));
- link.id = bprintf("%s_backbone", cluster->id);
+ LinkCreationArgs link;
+ link.id = std::string(cluster->id)+ "_backbone";
link.bandwidth = cluster->bb_bw;
link.latency = cluster->bb_lat;
link.policy = cluster->bb_sharing_policy;
- XBT_DEBUG("<link\tid=\"%s\" bw=\"%f\" lat=\"%f\"/>", link.id, cluster->bb_bw, cluster->bb_lat);
+ 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(Link::byName(link.id));
- free((char*)link.id);
+ routing_cluster_add_backbone(simgrid::surf::LinkImpl::byName(link.id.c_str()));
}
XBT_DEBUG("</AS>");
simgrid::surf::on_cluster(cluster);
delete cluster->radicals;
}
-void routing_cluster_add_backbone(simgrid::surf::Link* bb) {
+
+void routing_cluster_add_backbone(simgrid::surf::LinkImpl* bb)
+{
simgrid::kernel::routing::ClusterZone* cluster =
dynamic_cast<simgrid::kernel::routing::ClusterZone*>(current_routing);
void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet)
{
for (int radical : *cabinet->radicals) {
- char *hostname = bprintf("%s%d%s", cabinet->prefix, radical, cabinet->suffix);
+ std::string hostname = std::string(cabinet->prefix) + std::to_string(radical) + std::string(cabinet->suffix);
s_sg_platf_host_cbarg_t host;
memset(&host, 0, sizeof(host));
host.pstate = 0;
host.core_amount = 1;
- host.id = hostname;
+ host.id = hostname.c_str();
host.speed_per_pstate.push_back(cabinet->speed);
sg_platf_new_host(&host);
- s_sg_platf_link_cbarg_t link;
- memset(&link, 0, sizeof(link));
+ LinkCreationArgs link;
link.policy = SURF_LINK_FULLDUPLEX;
link.latency = cabinet->lat;
link.bandwidth = cabinet->bw;
- link.id = bprintf("link_%s",hostname);
+ link.id = "link_" + hostname;
sg_platf_new_link(&link);
- free((char*)link.id);
s_sg_platf_host_link_cbarg_t host_link;
memset(&host_link, 0, sizeof(host_link));
- host_link.id = hostname;
- host_link.link_up = bprintf("link_%s_UP",hostname);
- host_link.link_down = bprintf("link_%s_DOWN",hostname);
+ host_link.id = hostname.c_str();
+ host_link.link_up = bprintf("link_%s_UP",hostname.c_str());
+ host_link.link_down = bprintf("link_%s_DOWN",hostname.c_str());
sg_platf_new_hostlink(&host_link);
free((char*)host_link.link_up);
free((char*)host_link.link_down);
-
- free(hostname);
}
delete cabinet->radicals;
}
if (storage->properties) {
xbt_dict_cursor_t cursor = nullptr;
- char *key, *data;
+ char *key;
+ char* data;
xbt_dict_foreach (storage->properties, cursor, key, data)
s->setProperty(key, data);
xbt_dict_free(&storage->properties);
(void *) stype);
}
-static void mount_free(void *p)
-{
- mount_t mnt = (mount_t) p;
- xbt_free(mnt->name);
-}
-
void sg_platf_new_mount(sg_platf_mount_cbarg_t mount){
xbt_assert(xbt_lib_get_or_null(storage_lib, mount->storageId, ROUTING_STORAGE_LEVEL),
"Cannot mount non-existent disk \"%s\"", mount->storageId);
mnt.storage = surf_storage_resource_priv(surf_storage_resource_by_name(mount->storageId));
mnt.name = xbt_strdup(mount->name);
- if(!mount_list){
- XBT_DEBUG("Create a Mount list for %s",A_surfxml_host_id);
- mount_list = xbt_dynar_new(sizeof(s_mount_t), mount_free);
- }
- xbt_dynar_push(mount_list, &mnt);
+ if (mount_list.empty())
+ XBT_DEBUG("Create a Mount list for %s", A_surfxml_host_id);
+ mount_list.push_back(mnt);
}
void sg_platf_new_route(sg_platf_route_cbarg_t route)
std::function<void()> code = factory(std::move(args));
smx_process_arg_t arg = nullptr;
- smx_actor_t process_created = nullptr;
arg = new simgrid::simix::ProcessArg();
arg->name = std::string(process->argv[0]);
arg->kill_time = kill_time;
arg->properties = current_property_set;
- sg_host_simix(host)->boot_processes.push_back(arg);
+ host->extension<simgrid::simix::Host>()->boot_processes.push_back(arg);
if (start_time > SIMIX_get_clock()) {
arg->properties = current_property_set;
XBT_DEBUG("Process %s@%s will be started at time %f", arg->name.c_str(), arg->host->cname(), start_time);
- SIMIX_timer_set(start_time, [=]() {
- simix_global->create_process_function(
- arg->name.c_str(),
- std::move(arg->code),
- arg->data,
- arg->host,
- arg->kill_time,
- arg->properties,
- arg->auto_restart,
- nullptr);
+ SIMIX_timer_set(start_time, [arg, auto_restart]() {
+ smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), std::move(arg->code), arg->data,
+ arg->host, arg->properties, nullptr);
+ if (arg->kill_time >= 0)
+ simcall_process_set_kill_time(actor, arg->kill_time);
+ if (auto_restart)
+ SIMIX_process_auto_restart_set(actor, auto_restart);
delete arg;
});
} else { // start_time <= SIMIX_get_clock()
XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), host->cname());
- process_created = simix_global->create_process_function(
- arg->name.c_str(), std::move(code), nullptr,
- host, kill_time,
- current_property_set, auto_restart, nullptr);
+ smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), std::move(code), nullptr, host,
+ current_property_set, nullptr);
- /* verify if process has been created (won't be the case if the host is currently dead, but that's fine) */
- if (!process_created) {
- return;
+ /* The actor creation will fail if the host is currently dead, but that's fine */
+ if (actor != nullptr) {
+ if (arg->kill_time >= 0)
+ simcall_process_set_kill_time(actor, arg->kill_time);
+ if (auto_restart)
+ SIMIX_process_auto_restart_set(actor, auto_restart);
}
}
current_property_set = nullptr;
std::vector<double> speedPerPstate;
speedPerPstate.push_back(peer->speed);
- simgrid::s4u::Host* host = as->createHost(peer->id, &speedPerPstate, 1);
+ simgrid::s4u::Host* host = as->createHost(peer->id, &speedPerPstate, 1, nullptr);
- as->setPeerLink(host->pimpl_netcard, peer->bw_in, peer->bw_out, peer->coord);
- simgrid::s4u::Host::onCreation(*host);
+ as->setPeerLink(host->pimpl_netpoint, peer->bw_in, peer->bw_out, peer->coord);
/* Change from the defaults */
if (peer->state_trace)
void sg_platf_begin() { /* Do nothing: just for symmetry of user code */ }
void sg_platf_end() {
- simgrid::surf::on_postparse();
+ simgrid::s4u::onPlatformCreated();
}
/* Pick the right models for CPU, net and host, and call their model_init_preparse */
if (current_routing->hierarchy_ == simgrid::kernel::routing::NetZoneImpl::RoutingMode::unset)
current_routing->hierarchy_ = simgrid::kernel::routing::NetZoneImpl::RoutingMode::recursive;
/* add to the sons dictionary */
- xbt_dict_set(current_routing->children(), AS->id, (void *) new_as, nullptr);
+ current_routing->children()->push_back(static_cast<simgrid::s4u::NetZone*>(new_as));
}
/* set the new current component of the tree */
/** @brief Add a link connecting an host to the rest of its AS (which must be cluster or vivaldi) */
void sg_platf_new_hostlink(sg_platf_host_link_cbarg_t hostlink)
{
- simgrid::kernel::routing::NetCard *netcard = sg_host_by_name(hostlink->id)->pimpl_netcard;
- xbt_assert(netcard, "Host '%s' not found!", hostlink->id);
+ simgrid::kernel::routing::NetPoint* netpoint = sg_host_by_name(hostlink->id)->pimpl_netpoint;
+ xbt_assert(netpoint, "Host '%s' not found!", hostlink->id);
xbt_assert(dynamic_cast<simgrid::kernel::routing::ClusterZone*>(current_routing),
"Only hosts from Cluster and Vivaldi ASes can get an host_link.");
- simgrid::surf::Link* linkUp = Link::byName(hostlink->link_up);
- simgrid::surf::Link* linkDown = Link::byName(hostlink->link_down);
+ simgrid::surf::LinkImpl* linkUp = simgrid::surf::LinkImpl::byName(hostlink->link_up);
+ simgrid::surf::LinkImpl* linkDown = simgrid::surf::LinkImpl::byName(hostlink->link_down);
xbt_assert(linkUp, "Link '%s' not found!", hostlink->link_up);
xbt_assert(linkDown, "Link '%s' not found!", hostlink->link_down);
auto as_cluster = static_cast<simgrid::kernel::routing::ClusterZone*>(current_routing);
- if (as_cluster->privateLinks_.find(netcard->id()) != as_cluster->privateLinks_.end())
+ if (as_cluster->privateLinks_.find(netpoint->id()) != as_cluster->privateLinks_.end())
surf_parse_error("Host_link for '%s' is already defined!",hostlink->id);
- XBT_DEBUG("Push Host_link for host '%s' to position %d", netcard->cname(), netcard->id());
- as_cluster->privateLinks_.insert({netcard->id(), {linkUp, linkDown}});
+ XBT_DEBUG("Push Host_link for host '%s' to position %d", netpoint->cname(), netpoint->id());
+ as_cluster->privateLinks_.insert({netpoint->id(), {linkUp, linkDown}});
}
void sg_platf_new_trace(sg_platf_trace_cbarg_t trace)