/* 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 "simgrid/s4u/Engine.hpp"
+#include "simgrid/s4u/Storage.hpp"
#include "src/kernel/EngineImpl.hpp"
#include "src/simix/smx_private.h"
#include <string>
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);
-XBT_PRIVATE std::vector<s_mount_t> mount_list;
+XBT_PRIVATE std::map<std::string, simgrid::surf::StorageImpl*> mount_list;
+XBT_PRIVATE std::vector<std::string> known_storages;
namespace simgrid {
namespace surf {
}
}
+// FIXME: The following duplicates the content of s4u::Host
+namespace simgrid {
+namespace s4u {
+extern std::map<std::string, simgrid::s4u::Host*> host_list;
+}
+}
+
static int surf_parse_models_setup_already_called = 0;
+std::map<std::string, storage_type_t> storage_types;
/** The current AS in the parsing */
static simgrid::kernel::routing::NetZoneImpl* current_routing = nullptr;
if (args->coord && strcmp(args->coord, ""))
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 */
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()->netpointByNameOrNull(name),
+ xbt_assert(nullptr == simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name),
"Refusing to create a router named '%s': this name already describes a node.", name);
simgrid::kernel::routing::NetPoint* netpoint =
if (coords && strcmp(coords, ""))
new simgrid::kernel::routing::vivaldi::Coords(netpoint, coords);
- sg_instr_new_router(name);
return netpoint;
}
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))) {
+ if ((cluster->properties != nullptr) && (not xbt_dict_is_empty(cluster->properties))) {
xbt_dict_cursor_t cursor=nullptr;
char *key;
char* data;
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);
+ std::string tmp_link = std::string(link_id) + "_loopback";
+ XBT_DEBUG("<loopback\tid=\"%s\"\tbw=\"%f\"/>", tmp_link.c_str(), cluster->loopback_bw);
LinkCreationArgs link;
- link.id = tmp_link;
+ link.id = tmp_link.c_str();
link.bandwidth = cluster->loopback_bw;
link.latency = cluster->loopback_lat;
link.policy = SURF_LINK_FATPIPE;
sg_platf_new_link(&link);
- linkUp = simgrid::surf::LinkImpl::byName(tmp_link);
- linkDown = simgrid::surf::LinkImpl::byName(tmp_link);
- free(tmp_link);
+ linkUp = simgrid::surf::LinkImpl::byName(tmp_link.c_str());
+ linkDown = simgrid::surf::LinkImpl::byName(tmp_link.c_str());
auto as_cluster = static_cast<ClusterZone*>(current_as);
as_cluster->privateLinks_.insert({rankId * as_cluster->linkCountPerNode_, {linkUp, linkDown}});
linkUp = nullptr;
linkDown = nullptr;
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);
+ std::string tmp_link = std::string(link_id) + "_limiter";
+ XBT_DEBUG("<limiter\tid=\"%s\"\tbw=\"%f\"/>", tmp_link.c_str(), cluster->limiter_link);
LinkCreationArgs link;
- link.id = tmp_link;
+ link.id = tmp_link.c_str();
link.bandwidth = cluster->limiter_link;
link.latency = 0;
link.policy = SURF_LINK_SHARED;
sg_platf_new_link(&link);
- linkDown = simgrid::surf::LinkImpl::byName(tmp_link);
+ linkDown = simgrid::surf::LinkImpl::byName(tmp_link.c_str());
linkUp = linkDown;
- free(tmp_link);
current_as->privateLinks_.insert(
{rankId * current_as->linkCountPerNode_ + current_as->hasLoopback_, {linkUp, linkDown}});
}
// Add a router.
XBT_DEBUG(" ");
XBT_DEBUG("<router id=\"%s\"/>", cluster->router_id);
- if (!cluster->router_id || !strcmp(cluster->router_id, "")) {
+ if (not cluster->router_id || not 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);
dynamic_cast<simgrid::kernel::routing::ClusterZone*>(current_routing);
xbt_assert(cluster, "Only hosts from Cluster can get a backbone.");
- xbt_assert(nullptr == cluster->backbone_, "Cluster %s already has a backbone link!", cluster->name());
+ xbt_assert(nullptr == cluster->backbone_, "Cluster %s already has a backbone link!", cluster->getCname());
cluster->backbone_ = bb;
- XBT_DEBUG("Add a backbone to AS '%s'", current_routing->name());
+ XBT_DEBUG("Add a backbone to AS '%s'", current_routing->getCname());
}
void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet)
s_sg_platf_host_link_cbarg_t host_link;
memset(&host_link, 0, sizeof(host_link));
+ std::string tmp_link_up = std::string("link_") + hostname + "_UP";
+ std::string tmp_link_down = std::string("link_") + hostname + "_DOWN";
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());
+ host_link.link_up = tmp_link_up.c_str();
+ host_link.link_down = tmp_link_down.c_str();
sg_platf_new_hostlink(&host_link);
- free((char*)host_link.link_up);
- free((char*)host_link.link_down);
}
delete cabinet->radicals;
}
void sg_platf_new_storage(sg_platf_storage_cbarg_t storage)
{
- xbt_assert(!xbt_lib_get_or_null(storage_lib, storage->id,ROUTING_STORAGE_LEVEL),
- "Refusing to add a second storage named \"%s\"", storage->id);
+ 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);
- void* stype = xbt_lib_get_or_null(storage_type_lib, storage->type_id,ROUTING_STORAGE_TYPE_LEVEL);
- xbt_assert(stype,"No storage type '%s'", storage->type_id);
+ xbt_assert(storage_types.find(storage->type_id) != storage_types.end(), "No storage type '%s'", storage->type_id);
+ storage_type_t stype = storage_types.at(storage->type_id);
- XBT_DEBUG("ROUTING Create a storage name '%s' with type_id '%s' and content '%s'",
- storage->id,
- storage->type_id,
- storage->content);
+ XBT_DEBUG("ROUTING Create a storage name '%s' with type_id '%s' and content '%s'", storage->id, storage->type_id,
+ storage->content);
- xbt_lib_set(storage_lib, storage->id, ROUTING_STORAGE_LEVEL, (void *) xbt_strdup(storage->type_id));
+ known_storages.push_back(storage->id);
// if storage content is not specified use the content of storage_type if any
- if(!strcmp(storage->content,"") && strcmp(((storage_type_t) stype)->content,"")){
- storage->content = ((storage_type_t) stype)->content;
- storage->content_type = ((storage_type_t) stype)->content_type;
- XBT_DEBUG("For disk '%s' content is empty, inherit the content (of type %s) from storage type '%s' ",
- storage->id,((storage_type_t) stype)->content_type,
- ((storage_type_t) stype)->type_id);
+ if (not strcmp(storage->content, "") && strcmp(stype->content, "")) {
+ storage->content = stype->content;
+ XBT_DEBUG("For disk '%s' content is empty, inherit the content (of type %s)", storage->id, stype->type_id);
}
XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s' "
- "\n\t\tmodel '%s' \n\t\tcontent '%s'\n\t\tcontent_type '%s' "
- "\n\t\tproperties '%p''\n",
- storage->id,
- ((storage_type_t) stype)->model,
- ((storage_type_t) stype)->type_id,
- storage->content,
- storage->content_type,
- storage->properties);
-
- auto s = surf_storage_model->createStorage(storage->id, ((storage_type_t)stype)->type_id, storage->content,
- storage->content_type, storage->attach);
+ "\n\t\tmodel '%s' \n\t\tcontent '%s' "
+ "\n\t\tproperties '%p''\n",
+ storage->id, stype->model, stype->type_id, storage->content, storage->properties);
+
+ auto s = surf_storage_model->createStorage(storage->id, stype->type_id, storage->content, storage->attach);
if (storage->properties) {
xbt_dict_cursor_t cursor = nullptr;
xbt_dict_free(&storage->properties);
}
}
-void sg_platf_new_storage_type(sg_platf_storage_type_cbarg_t storage_type){
- xbt_assert(!xbt_lib_get_or_null(storage_type_lib, storage_type->id,ROUTING_STORAGE_TYPE_LEVEL),
- "Reading a storage type, processing unit \"%s\" already exists", storage_type->id);
+void sg_platf_new_storage_type(sg_platf_storage_type_cbarg_t storage_type)
+{
+ xbt_assert(storage_types.find(storage_type->id) == storage_types.end(),
+ "Reading a storage type, processing unit \"%s\" already exists", storage_type->id);
storage_type_t stype = xbt_new0(s_storage_type_t, 1);
stype->model = xbt_strdup(storage_type->model);
stype->properties = storage_type->properties;
stype->content = xbt_strdup(storage_type->content);
- stype->content_type = xbt_strdup(storage_type->content_type);
stype->type_id = xbt_strdup(storage_type->id);
stype->size = storage_type->size;
stype->model_properties = storage_type->model_properties;
- XBT_DEBUG("ROUTING Create a storage type id '%s' with model '%s', content '%s', and content_type '%s'",
- stype->type_id, stype->model, storage_type->content, storage_type->content_type);
+ XBT_DEBUG("ROUTING Create a storage type id '%s' with model '%s', content '%s'", stype->type_id, stype->model,
+ storage_type->content);
- xbt_lib_set(storage_type_lib, stype->type_id, ROUTING_STORAGE_TYPE_LEVEL, (void*)stype);
+ storage_types.insert({std::string(stype->type_id), stype});
}
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);
+ xbt_assert(std::find(known_storages.begin(), known_storages.end(), mount->storageId) != known_storages.end(),
+ "Cannot mount non-existent disk \"%s\"", mount->storageId);
XBT_DEBUG("ROUTING Mount '%s' on '%s'",mount->storageId, mount->name);
- s_mount_t mnt;
- mnt.storage = surf_storage_resource_priv(surf_storage_resource_by_name(mount->storageId));
- mnt.name = xbt_strdup(mount->name);
-
if (mount_list.empty())
XBT_DEBUG("Create a Mount list for %s", A_surfxml_host_id);
- mount_list.push_back(mnt);
+ mount_list.insert({std::string(mount->name), simgrid::surf::StorageImpl::byName(mount->storageId)});
}
void sg_platf_new_route(sg_platf_route_cbarg_t route)
void sg_platf_new_process(sg_platf_process_cbarg_t process)
{
sg_host_t host = sg_host_by_name(process->host);
- if (!host) {
+ if (not host) {
// The requested host does not exist. Do a nice message to the user
- char* tmp = bprintf("Cannot create process '%s': host '%s' does not exist\nExisting hosts: '", process->function,
- process->host);
- xbt_strbuff_t msg = xbt_strbuff_new_from(tmp);
- free(tmp);
- xbt_dynar_t all_hosts = xbt_dynar_sort_strings(sg_hosts_as_dynar());
- simgrid::s4u::Host* host;
- unsigned int cursor;
- xbt_dynar_foreach(all_hosts,cursor, host) {
- xbt_strbuff_append(msg, host->cname());
- xbt_strbuff_append(msg,"', '");
- if (msg->used > 1024) {
- msg->data[msg->used-3]='\0';
- msg->used -= 3;
-
- xbt_strbuff_append(msg," ...(list truncated)......");// That will be shortened by 3 chars when existing the loop
+ std::string msg = std::string("Cannot create process '") + process->function + "': host '" + process->host +
+ "' does not exist\nExisting hosts: '";
+ for (auto kv : simgrid::s4u::host_list) {
+ simgrid::s4u::Host* host = kv.second;
+ msg += host->getName();
+ msg += "', '";
+ if (msg.length() > 1024) {
+ msg.pop_back(); // remove trailing quote
+ msg += "...(list truncated)......";
break;
}
}
- msg->data[msg->used-3]='\0';
- xbt_die("%s", msg->data);
+ xbt_die("%s", msg.c_str());
}
simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(process->function);
xbt_assert(factory, "Function '%s' unknown", process->function);
double start_time = process->start_time;
double kill_time = process->kill_time;
- int auto_restart = process->on_failure == SURF_PROCESS_ON_FAILURE_DIE ? 0 : 1;
+ int auto_restart = process->on_failure == SURF_ACTOR_ON_FAILURE_DIE ? 0 : 1;
std::vector<std::string> args(process->argv, process->argv + process->argc);
std::function<void()> code = factory(std::move(args));
arg->kill_time = kill_time;
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);
+ XBT_DEBUG("Process %s@%s will be started at time %f", arg->name.c_str(), arg->host->getCname(), start_time);
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);
delete arg;
});
} else { // start_time <= SIMIX_get_clock()
- XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), host->cname());
+ XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), host->getCname());
smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), std::move(code), nullptr, host,
current_property_set, nullptr);
const char* storage_model_name = xbt_cfg_get_string("storage/model");
/* The compound host model is needed when using non-default net/cpu models */
- if ((!xbt_cfg_is_default_value("network/model") || !xbt_cfg_is_default_value("cpu/model")) &&
+ if ((not xbt_cfg_is_default_value("network/model") || not xbt_cfg_is_default_value("cpu/model")) &&
xbt_cfg_is_default_value("host/model")) {
host_model_name = "compound";
xbt_cfg_set_string("host/model", host_model_name);
}
XBT_DEBUG("host model: %s", host_model_name);
- if (!strcmp(host_model_name, "compound")) {
+ if (not strcmp(host_model_name, "compound")) {
xbt_assert(cpu_model_name, "Set a cpu model to use with the 'compound' host model");
xbt_assert(network_model_name, "Set a network model to use with the 'compound' host model");
*/
simgrid::s4u::NetZone* sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS)
{
- if (!surf_parse_models_setup_already_called) {
+ if (not surf_parse_models_setup_already_called) {
/* 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::instance()->pimpl->netRoot_ == nullptr,
- "All defined components must belong to a AS");
- simgrid::s4u::Engine::instance()->pimpl->netRoot_ = new_as;
+ 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_as;
} else {
/* set the father behavior */
if (current_routing->hierarchy_ == simgrid::kernel::routing::NetZoneImpl::RoutingMode::unset)
current_routing->hierarchy_ = simgrid::kernel::routing::NetZoneImpl::RoutingMode::recursive;
/* add to the sons dictionary */
- current_routing->children()->push_back(static_cast<simgrid::s4u::NetZone*>(new_as));
+ current_routing->getChildren()->push_back(static_cast<simgrid::s4u::NetZone*>(new_as));
}
/* set the new current component of the tree */
current_routing = new_as;
- if (TRACE_is_enabled())
- sg_instr_AS_begin(AS);
+ simgrid::s4u::NetZone::onCreation(*new_as); // notify the signal
return new_as;
}
{
xbt_assert(current_routing, "Cannot seal the current AS: none under construction");
current_routing->seal();
- current_routing = static_cast<simgrid::kernel::routing::NetZoneImpl*>(current_routing->father());
-
- if (TRACE_is_enabled())
- sg_instr_AS_end();
+ simgrid::s4u::NetZone::onSeal(*current_routing);
+ current_routing = static_cast<simgrid::kernel::routing::NetZoneImpl*>(current_routing->getFather());
}
/** @brief Add a link connecting an host to the rest of its AS (which must be cluster or vivaldi) */