#include "xbt/str.h"
#include "xbt/dict.h"
#include "xbt/RngStream.h"
+#include <xbt/functional.hpp>
#include <xbt/signal.hpp>
#include "src/surf/HostImpl.hpp"
#include "surf/surf.h"
+#include "simgrid/s4u/engine.hpp"
+#include "src/kernel/EngineImpl.hpp"
#include "src/simix/smx_private.h"
#include "src/include/simgrid/sg_config.h"
#include "src/surf/xml/platf_private.hpp"
+#include "src/surf/HostImpl.hpp"
#include "src/surf/cpu_interface.hpp"
#include "src/surf/network_interface.hpp"
-#include "surf/surf_routing.h" // FIXME: brain dead public header
-
-#include "src/surf/AsImpl.hpp"
-#include "src/surf/AsCluster.hpp"
-#include "src/surf/AsClusterTorus.hpp"
-#include "src/surf/AsClusterFatTree.hpp"
-#include "src/surf/AsDijkstra.hpp"
-#include "src/surf/AsFloyd.hpp"
-#include "src/surf/AsFull.hpp"
-#include "src/surf/AsNone.hpp"
-#include "src/surf/AsVivaldi.hpp"
+
+#include "src/kernel/routing/AsCluster.hpp"
+#include "src/kernel/routing/AsClusterDragonfly.hpp"
+#include "src/kernel/routing/AsClusterFatTree.hpp"
+#include "src/kernel/routing/AsClusterTorus.hpp"
+#include "src/kernel/routing/AsDijkstra.hpp"
+#include "src/kernel/routing/AsFloyd.hpp"
+#include "src/kernel/routing/AsFull.hpp"
+#include "src/kernel/routing/AsImpl.hpp"
+#include "src/kernel/routing/AsNone.hpp"
+#include "src/kernel/routing/AsVivaldi.hpp"
+#include "src/kernel/routing/NetCard.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);
-XBT_PRIVATE xbt_dynar_t mount_list = NULL;
+XBT_PRIVATE xbt_dynar_t mount_list = nullptr;
namespace simgrid {
namespace surf {
static int surf_parse_models_setup_already_called = 0;
-/* Turn something like "1-4,6,9-11" into the vector {1,2,3,4,6,9,10,11} */
-static std::vector<int> *explodesRadical(const char*radicals){
- std::vector<int> *exploded = new std::vector<int>();
- char *groups;
- unsigned int iter;
-
- //Make all hosts
- xbt_dynar_t radical_elements = xbt_str_split(radicals, ",");
- xbt_dynar_foreach(radical_elements, iter, groups) {
-
- xbt_dynar_t radical_ends = xbt_str_split(groups, "-");
- int start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *));
- int end=0;
-
- switch (xbt_dynar_length(radical_ends)) {
- case 1:
- end = start;
- break;
- case 2:
- end = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 1, char *));
- break;
- default:
- surf_parse_error("Malformed radical: %s", groups);
- break;
- }
-
- for (int i = start; i <= end; i++)
- exploded->push_back( i );
-
- xbt_dynar_free(&radical_ends);
- }
- xbt_dynar_free(&radical_elements);
-
- return exploded;
-}
-
-
/** The current AS in the parsing */
-static simgrid::surf::AsImpl *current_routing = NULL;
-static simgrid::surf::AsImpl* routing_get_current()
+static simgrid::kernel::routing::AsImpl *current_routing = nullptr;
+static simgrid::kernel::routing::AsImpl *routing_get_current()
{
return current_routing;
}
/** Module management function: creates all internal data structures */
-void sg_platf_init(void) {
+void sg_platf_init() {
}
/** Module management function: frees all internal data structures */
-void sg_platf_exit(void) {
+void sg_platf_exit() {
simgrid::surf::on_link.disconnect_all_slots();
simgrid::surf::on_cluster.disconnect_all_slots();
simgrid::surf::on_postparse.disconnect_all_slots();
surf_parse_lex_destroy();
}
-/** @brief Add an "host" to the current AS */
-void sg_platf_new_host(sg_platf_host_cbarg_t host)
+/** @brief Add an host to the current AS */
+void sg_platf_new_host(sg_platf_host_cbarg_t args)
{
- xbt_assert(! sg_host_by_name(host->id), "Refusing to create a second host named '%s'.", host->id);
+ simgrid::s4u::Host* host = routing_get_current()->createHost(args->id, &args->speed_per_pstate, args->core_amount);
- simgrid::surf::AsImpl* current_routing = routing_get_current();
- if (current_routing->hierarchy_ == simgrid::surf::AsImpl::RoutingMode::unset)
- current_routing->hierarchy_ = simgrid::surf::AsImpl::RoutingMode::base;
+ 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;
- simgrid::surf::NetCard *netcard =
- new simgrid::surf::NetCardImpl(host->id, simgrid::surf::NetCard::Type::Host, current_routing);
-
- sg_host_t h = simgrid::s4u::Host::by_name_or_create(host->id);
- h->pimpl_netcard = netcard;
-
- if(mount_list){
- xbt_lib_set(storage_lib, host->id, ROUTING_STORAGE_HOST_LEVEL, (void *) mount_list);
- mount_list = NULL;
- }
-
- if (host->coord && strcmp(host->coord, "")) {
- unsigned int cursor;
- char*str;
-
- xbt_assert(COORD_HOST_LEVEL, "To use host coordinates, please add --cfg=network/coordinates:yes to your command line");
- /* Pre-parse the host coordinates -- FIXME factorize with routers by overloading the routing->parse_PU function*/
- xbt_dynar_t ctn_str = xbt_str_split_str(host->coord, " ");
- xbt_assert(xbt_dynar_length(ctn_str)==3,"Coordinates of %s must have 3 dimensions", host->id);
-
- xbt_dynar_t ctn = xbt_dynar_new(sizeof(double),NULL);
- xbt_dynar_foreach(ctn_str,cursor, str) {
- double val = xbt_str_parse_double(str, "Invalid coordinate: %s");
- xbt_dynar_push(ctn,&val);
- }
- xbt_dynar_free(&ctn_str);
- xbt_dynar_shrink(ctn, 0);
- h->extension_set(COORD_HOST_LEVEL, (void *) ctn);
- }
-
- simgrid::surf::Cpu *cpu = surf_cpu_model_pm->createCpu( h, host->speed_per_pstate, host->core_amount);
- if (host->state_trace)
- cpu->setStateTrace(host->state_trace);
- if (host->speed_trace)
- cpu->setSpeedTrace(host->speed_trace);
- surf_host_model->createHost(host->id, netcard, cpu)->attach(h);
-
- if (host->properties) {
- xbt_dict_cursor_t cursor=NULL;
+ if (args->properties) {
+ xbt_dict_cursor_t cursor=nullptr;
char *key,*data;
- xbt_dict_foreach(host->properties,cursor,key,data)
- h->setProperty(key,data);
+ xbt_dict_foreach (args->properties, cursor, key, data)
+ host->setProperty(key, data);
+ xbt_dict_free(&args->properties);
}
- if (host->pstate != 0)
- cpu->setPState(host->pstate);
+ /* Change from the defaults */
+ if (args->state_trace)
+ host->pimpl_cpu->setStateTrace(args->state_trace);
+ if (args->speed_trace)
+ host->pimpl_cpu->setSpeedTrace(args->speed_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(*h);
+ simgrid::s4u::Host::onCreation(*host);
if (TRACE_is_enabled() && TRACE_needs_platform())
- sg_instr_new_host(host);
+ 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::surf::AsImpl* current_routing = routing_get_current();
+ simgrid::kernel::routing::AsImpl* current_routing = routing_get_current();
- if (current_routing->hierarchy_ == simgrid::surf::AsImpl::RoutingMode::unset)
- current_routing->hierarchy_ = simgrid::surf::AsImpl::RoutingMode::base;
+ if (current_routing->hierarchy_ == simgrid::kernel::routing::AsImpl::RoutingMode::unset)
+ current_routing->hierarchy_ = simgrid::kernel::routing::AsImpl::RoutingMode::base;
xbt_assert(nullptr == xbt_lib_get_or_null(as_router_lib, router->id, ROUTING_ASR_LEVEL),
"Refusing to create a router named '%s': this name already describes a node.", router->id);
- simgrid::surf::NetCard *netcard =
- new simgrid::surf::NetCardImpl(router->id, simgrid::surf::NetCard::Type::Router, current_routing);
- xbt_lib_set(as_router_lib, router->id, ROUTING_ASR_LEVEL, (void *) netcard);
- XBT_DEBUG("Having set name '%s' id '%d'", router->id, netcard->id());
+ simgrid::kernel::routing::NetCard* netcard =
+ new simgrid::kernel::routing::NetCard(router->id, simgrid::kernel::routing::NetCard::Type::Router, current_routing);
+ xbt_lib_set(as_router_lib, router->id, ROUTING_ASR_LEVEL, netcard);
+ XBT_DEBUG("Router '%s' has the id %d", router->id, netcard->id());
- if (router->coord && strcmp(router->coord, "")) {
- unsigned int cursor;
- char*str;
-
- xbt_assert(COORD_ASR_LEVEL, "To use host coordinates, please add --cfg=network/coordinates:yes to your command line");
- /* Pre-parse the host coordinates */
- xbt_dynar_t ctn_str = xbt_str_split_str(router->coord, " ");
- xbt_assert(xbt_dynar_length(ctn_str)==3,"Coordinates of %s must have 3 dimensions", router->id);
- xbt_dynar_t ctn = xbt_dynar_new(sizeof(double),NULL);
- xbt_dynar_foreach(ctn_str,cursor, str) {
- double val = xbt_str_parse_double(str, "Invalid coordinate: %s");
- xbt_dynar_push(ctn,&val);
- }
- xbt_dynar_free(&ctn_str);
- xbt_dynar_shrink(ctn, 0);
- xbt_lib_set(as_router_lib, router->id, COORD_ASR_LEVEL, (void *) ctn);
- }
+ if (router->coord && strcmp(router->coord, ""))
+ new simgrid::kernel::routing::vivaldi::Coords(netcard, router->coord);
+
+ auto cluster = dynamic_cast<simgrid::kernel::routing::AsCluster*>(current_routing);
+ if(cluster != nullptr)
+ cluster->router_ = static_cast<simgrid::kernel::routing::NetCard*>(xbt_lib_get_or_null(as_router_lib, router->id, ROUTING_ASR_LEVEL));
if (TRACE_is_enabled() && TRACE_needs_platform())
sg_instr_new_router(router);
names.push_back(xbt_strdup(link->id));
}
for (auto link_name : names) {
- Link *l = surf_network_model->createLink(link_name, link->bandwidth, link->latency, link->policy, link->properties);
+ Link* l = surf_network_model->createLink(link_name, link->bandwidth, link->latency, link->policy);
+
+ if (link->properties) {
+ xbt_dict_cursor_t cursor = nullptr;
+ char *key, *data;
+ xbt_dict_foreach (link->properties, cursor, key, data)
+ l->setProperty(key, data);
+ xbt_dict_free(&link->properties);
+ }
if (link->latency_trace)
l->setLatencyTrace(link->latency_trace);
void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster)
{
- using simgrid::surf::AsCluster;
- using simgrid::surf::AsClusterTorus;
- using simgrid::surf::AsClusterFatTree;
+ using simgrid::kernel::routing::AsCluster;
+ using simgrid::kernel::routing::AsClusterDragonfly;
+ using simgrid::kernel::routing::AsClusterFatTree;
+ using simgrid::kernel::routing::AsClusterTorus;
int rankId=0;
case SURF_CLUSTER_TORUS:
AS.routing = A_surfxml_AS_routing_ClusterTorus;
break;
+ case SURF_CLUSTER_DRAGONFLY:
+ AS.routing = A_surfxml_AS_routing_ClusterDragonfly;
+ break;
case SURF_CLUSTER_FAT_TREE:
AS.routing = A_surfxml_AS_routing_ClusterFatTree;
break;
break;
}
sg_platf_new_AS_begin(&AS);
- simgrid::
surf::AsCluster *current_as = static_cast<AsCluster*>(routing_get_current());
+ simgrid::
kernel::routing::AsCluster *current_as = static_cast<AsCluster*>(routing_get_current());
current_as->parse_specific_arguments(cluster);
if(cluster->loopback_bw!=0 || cluster->loopback_lat!=0){
- current_as->nb_links_per_node_++;
- current_as->has_loopback_ = 1;
+ current_as->linkCountPerNode_++;
+ current_as->hasLoopback_ = 1;
}
if(cluster->limiter_link!=0){
- current_as->nb_links_per_node_++;
- current_as->has_limiter_ = 1;
+ current_as->linkCountPerNode_++;
+ current_as->hasLimiter_ = 1;
}
- std::vector<int> *radicals = explodesRadical(cluster->radical);
- for (int i : *radicals) {
+ for (int i : *cluster->radicals) {
char * host_id = bprintf("%s%d%s", cluster->prefix, i, cluster->suffix);
char * link_id = bprintf("%s_link_%d", cluster->id, i);
s_sg_platf_host_cbarg_t host;
memset(&host, 0, sizeof(host));
host.id = host_id;
- if ((cluster->properties != NULL) && (!xbt_dict_is_empty(cluster->properties))) {
- xbt_dict_cursor_t cursor=NULL;
+ if ((cluster->properties != nullptr) && (!xbt_dict_is_empty(cluster->properties))) {
+ xbt_dict_cursor_t cursor=nullptr;
char *key,*data;
- host.properties = xbt_dict_new();
+ host.properties = xbt_dict_new_homogeneous(free);
xbt_dict_foreach(cluster->properties,cursor,key,data) {
- xbt_dict_set(host.properties, key, xbt_strdup(data),free);
+ xbt_dict_set(host.properties, key, xbt_strdup(data), nullptr);
}
}
- host.speed_per_pstate = xbt_dynar_new(sizeof(double), NULL);
- xbt_dynar_push(host.speed_per_pstate,&cluster->speed);
+ host.speed_per_pstate.push_back(cluster->speed);
host.pstate = 0;
host.core_amount = cluster->core_amount;
host.coord = "";
sg_platf_new_host(&host);
- xbt_dynar_free(&host.speed_per_pstate);
XBT_DEBUG("</host>");
XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%f\"\tlat=\"%f\"/>", link_id, cluster->bw, cluster->lat);
- s_surf_parsing_link_up_down_t info_lim, info_loop;
+ s_surf_parsing_link_up_down_t info_lim;
+ s_surf_parsing_link_up_down_t info_loop;
// All links are saved in a matrix;
- // every row describes a single node; every node
- // may have multiple links.
+ // every row describes a single node; every node may have multiple links.
// the first column may store a link from x to x if p_has_loopback is set
// the second column may store a limiter link if p_has_limiter is set
// other columns are to store one or more link for the node
//add a loopback link
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->limiter_link);
+ XBT_DEBUG("<loopback\tid=\"%s\"\tbw=\"%f\"/>", tmp_link, cluster->loopback_bw);
memset(&link, 0, sizeof(link));
link.id = tmp_link;
link.latency = cluster->loopback_lat;
link.policy = SURF_LINK_FATPIPE;
sg_platf_new_link(&link);
- info_loop.link_up = info_loop.link_down = Link::byName(tmp_link);
+ info_loop.linkUp = Link::byName(tmp_link);
+ info_loop.linkDown = Link::byName(tmp_link);
free(tmp_link);
+
auto as_cluster = static_cast<AsCluster*>(current_as);
- xbt_dynar_set(as_cluster->privateLinks_, rankId*as_cluster->nb_links_per_node_, &info_loop);
+ as_cluster->privateLinks_.insert({rankId*as_cluster->linkCountPerNode_, info_loop});
}
//add a limiter link (shared link to account for maximal bandwidth of the node)
link.latency = 0;
link.policy = SURF_LINK_SHARED;
sg_platf_new_link(&link);
- info_lim.link_up = info_lim.link_down = Link::byName(tmp_link);
+ info_lim.linkUp = info_lim.linkDown = Link::byName(tmp_link);
free(tmp_link);
- xbt_dynar_set(current_as->privateLinks_, rankId * current_as->nb_links_per_node_ + current_as->has_loopback_ , &info_lim);
+ current_as->privateLinks_.insert(
+ {rankId * current_as->linkCountPerNode_ + current_as->hasLoopback_ , info_lim});
}
//call the cluster function that adds the others links
if (cluster->topology == SURF_CLUSTER_FAT_TREE) {
- ((AsClusterFatTree*) current_as)->addProcessingNode(i);
+ static_cast<AsClusterFatTree*>(current_as)->addProcessingNode(i);
}
else {
current_as->create_links_for_node(cluster, i, rankId,
- rankId*current_as->nb_links_per_node_ + current_as->has_loopback_ + current_as->has_limiter_ );
+ rankId*current_as->linkCountPerNode_ + current_as->hasLoopback_ + current_as->hasLimiter_ );
}
xbt_free(link_id);
xbt_free(host_id);
// and it's very useful to connect clusters together
XBT_DEBUG(" ");
XBT_DEBUG("<router id=\"%s\"/>", cluster->router_id);
- char *newid = NULL;
+ 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::surf::NetCard*) xbt_lib_get_or_null(as_router_lib, router.id, ROUTING_ASR_LEVEL);
+ current_as->router_ = (simgrid::kernel::routing::NetCard*) xbt_lib_get_or_null(as_router_lib, router.id, ROUTING_ASR_LEVEL);
free(newid);
//Make the backbone
sg_platf_new_AS_seal();
simgrid::surf::on_cluster(cluster);
+ delete cluster->radicals;
}
void routing_cluster_add_backbone(simgrid::surf::Link* bb) {
- simgrid::surf::AsCluster *cluster = dynamic_cast<simgrid::surf::AsCluster*>(current_routing);
+ simgrid::kernel::routing::AsCluster *cluster = dynamic_cast<simgrid::kernel::routing::AsCluster*>(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());
void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet)
{
- std::vector<int> *radicals = explodesRadical(cabinet->radical);
-
- for (int radical : *radicals) {
+ for (int radical : *cabinet->radicals) {
char *hostname = bprintf("%s%d%s", cabinet->prefix, radical, 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.speed_per_pstate = xbt_dynar_new(sizeof(double), NULL);
- xbt_dynar_push(host.speed_per_pstate,&cabinet->speed);
+ host.speed_per_pstate.push_back(cabinet->speed);
sg_platf_new_host(&host);
- xbt_dynar_free(&host.speed_per_pstate);
s_sg_platf_link_cbarg_t link;
memset(&link, 0, sizeof(link));
free(hostname);
}
- delete(radicals);
+ delete cabinet->radicals;
}
void sg_platf_new_storage(sg_platf_storage_cbarg_t storage)
storage->content_type,
storage->properties);
- surf_storage_model->createStorage(storage->id,
- ((storage_type_t) stype)->type_id,
- storage->content,
- storage->content_type,
- storage->properties,
- storage->attach);
+ auto s = surf_storage_model->createStorage(storage->id, ((storage_type_t)stype)->type_id, storage->content,
+ storage->content_type, storage->attach);
+
+ if (storage->properties) {
+ xbt_dict_cursor_t cursor = nullptr;
+ char *key, *data;
+ xbt_dict_foreach (storage->properties, cursor, key, data)
+ s->setProperty(key, data);
+ xbt_dict_free(&storage->properties);
+ }
}
void sg_platf_new_storage_type(sg_platf_storage_type_cbarg_t storage_type){
void sg_platf_new_process(sg_platf_process_cbarg_t process)
{
- xbt_assert(simix_global,"Cannot create process without SIMIX.");
-
sg_host_t host = sg_host_by_name(process->host);
if (!host) {
// The requested host does not exist. Do a nice message to the user
msg->used -= 3;
xbt_strbuff_append(msg," ...(list truncated)......");// That will be shortened by 3 chars when existing the loop
+ break;
}
}
msg->data[msg->used-3]='\0';
xbt_die("%s", msg->data);
}
- xbt_main_func_t parse_code = SIMIX_get_registered_function(process->function);
- xbt_assert(parse_code, "Function '%s' unknown", process->function);
+ 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;
- smx_process_arg_t arg = NULL;
- smx_process_t process_created = NULL;
-
- arg = xbt_new0(s_smx_process_arg_t, 1);
- arg->code = parse_code;
- arg->data = NULL;
- arg->hostname = sg_host_get_name(host);
- arg->argc = process->argc;
- arg->argv = xbt_new(char *,process->argc);
- int i;
- for (i=0; i<process->argc; i++)
- arg->argv[i] = xbt_strdup(process->argv[i]);
- arg->name = xbt_strdup(arg->argv[0]);
+ std::vector<std::string> args(process->argv, process->argv + process->argc);
+ 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->code = code;
+ arg->data = nullptr;
+ arg->host = host;
arg->kill_time = kill_time;
arg->properties = current_property_set;
- if (!sg_host_simix(host)->boot_processes) {
- sg_host_simix(host)->boot_processes = xbt_dynar_new(sizeof(smx_process_arg_t), _SIMIX_host_free_process_arg);
- }
- xbt_dynar_push_as(sg_host_simix(host)->boot_processes,smx_process_arg_t,arg);
+
+ sg_host_simix(host)->boot_processes.push_back(arg);
if (start_time > SIMIX_get_clock()) {
- arg = xbt_new0(s_smx_process_arg_t, 1);
- arg->name = (char*)(process->argv)[0];
- arg->code = parse_code;
- arg->data = NULL;
- arg->hostname = sg_host_get_name(host);
- arg->argc = process->argc;
- arg->argv = (char**)(process->argv);
+
+ arg = new simgrid::simix::ProcessArg();
+ arg->name = std::string(process->argv[0]);
+ arg->code = std::move(code);
+ arg->data = nullptr;
+ arg->host = host;
arg->kill_time = kill_time;
arg->properties = current_property_set;
- XBT_DEBUG("Process %s(%s) will be started at time %f", arg->name,
- arg->hostname, start_time);
- SIMIX_timer_set(start_time, [](void* arg) {
- SIMIX_process_create_from_wrapper((smx_process_arg_t) arg);
- }, arg);
+ XBT_DEBUG("Process %s@%s will be started at time %f",
+ arg->name.c_str(), arg->host->name().c_str(), 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);
+ delete arg;
+ });
} else { // start_time <= SIMIX_get_clock()
- XBT_DEBUG("Starting Process %s(%s) right now", arg->name, sg_host_get_name(host));
-
- if (simix_global->create_process_function)
- process_created = simix_global->create_process_function(
- arg->name,
- parse_code,
- NULL,
- sg_host_get_name(host),
- kill_time,
- process->argc,
- (char**)(process->argv),
- current_property_set,
- auto_restart, NULL);
- else
- process_created = simcall_process_create(arg->name, parse_code, NULL, sg_host_get_name(host), kill_time, process->argc,
- (char**)process->argv, current_property_set,auto_restart);
+ 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);
/* 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;
}
}
- current_property_set = NULL;
+ current_property_set = nullptr;
}
void sg_platf_new_peer(sg_platf_peer_cbarg_t peer)
{
- using simgrid::surf::NetCard;
- using simgrid::surf::AsCluster;
-
- char *host_id = bprintf("peer_%s", peer->id);
- char *router_id = bprintf("router_%s", peer->id);
-
- XBT_DEBUG(" ");
-
- XBT_DEBUG("<AS id=\"%s\"\trouting=\"Cluster\">", peer->id);
- s_sg_platf_AS_cbarg_t AS;
- AS.id = peer->id;
- AS.routing = A_surfxml_AS_routing_Cluster;
- sg_platf_new_AS_begin(&AS);
-
- XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%f\"/>", host_id, peer->speed);
- s_sg_platf_host_cbarg_t host;
- memset(&host, 0, sizeof(host));
- host.id = host_id;
-
- host.speed_per_pstate = xbt_dynar_new(sizeof(double), NULL);
- xbt_dynar_push(host.speed_per_pstate,&peer->speed);
- host.pstate = 0;
- host.speed_trace = peer->availability_trace;
- host.state_trace = peer->state_trace;
- host.core_amount = 1;
- sg_platf_new_host(&host);
- xbt_dynar_free(&host.speed_per_pstate);
-
- s_sg_platf_link_cbarg_t link;
- memset(&link, 0, sizeof(link));
- link.policy = SURF_LINK_SHARED;
- link.latency = peer->lat;
-
- char* link_up = bprintf("link_%s_UP",peer->id);
- XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%f\"\tlat=\"%f\"/>", link_up, peer->bw_out, peer->lat);
- link.id = link_up;
- link.bandwidth = peer->bw_out;
- sg_platf_new_link(&link);
-
- char* link_down = bprintf("link_%s_DOWN",peer->id);
- XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%f\"\tlat=\"%f\"/>", link_down, peer->bw_in, peer->lat);
- link.id = link_down;
- link.bandwidth = peer->bw_in;
- sg_platf_new_link(&link);
-
- XBT_DEBUG("<host_link\tid=\"%s\"\tup=\"%s\"\tdown=\"%s\" />", host_id,link_up,link_down);
- s_sg_platf_host_link_cbarg_t host_link;
- memset(&host_link, 0, sizeof(host_link));
- host_link.id = host_id;
- host_link.link_up = link_up;
- host_link.link_down = link_down;
- sg_platf_new_hostlink(&host_link);
- free(link_up);
- free(link_down);
-
- XBT_DEBUG("<router id=\"%s\"/>", router_id);
- s_sg_platf_router_cbarg_t router;
- memset(&router, 0, sizeof(router));
- router.id = router_id;
- router.coord = peer->coord;
- sg_platf_new_router(&router);
- static_cast<AsCluster*>(current_routing)->router_ = static_cast<NetCard*>(xbt_lib_get_or_null(as_router_lib, router.id, ROUTING_ASR_LEVEL));
-
- XBT_DEBUG("</AS>");
- sg_platf_new_AS_seal();
- XBT_DEBUG(" ");
-
- free(router_id);
- free(host_id);
+ using simgrid::kernel::routing::AsVivaldi;
+
+ AsVivaldi* as = dynamic_cast<simgrid::kernel::routing::AsVivaldi*>(current_routing);
+ xbt_assert(as, "<peer> tag can only be used in Vivaldi ASes");
+
+ std::vector<double> speedPerPstate;
+ speedPerPstate.push_back(peer->speed);
+ simgrid::s4u::Host* host = as->createHost(peer->id, &speedPerPstate, 1);
+ as->setPeerLink(host->pimpl_netcard, peer->bw_in, peer->bw_out, peer->lat, peer->coord);
+ simgrid::s4u::Host::onCreation(*host);
+
+ /* Change from the defaults */
+ if (peer->state_trace)
+ host->pimpl_cpu->setStateTrace(peer->state_trace);
+ if (peer->availability_trace)
+ host->pimpl_cpu->setSpeedTrace(peer->availability_trace);
}
void sg_platf_begin() { /* Do nothing: just for symmetry of user code */ }
/* Pick the right models for CPU, net and host, and call their model_init_preparse */
static void surf_config_models_setup()
{
- const char *host_model_name;
- const char *vm_model_name;
- int host_id = -1;
- int vm_id = -1;
- char *network_model_name = NULL;
- char *cpu_model_name = NULL;
- int storage_id = -1;
- char *storage_model_name = NULL;
-
- host_model_name = xbt_cfg_get_string(_sg_cfg_set, "host/model");
- vm_model_name = xbt_cfg_get_string(_sg_cfg_set, "vm/model");
- network_model_name = xbt_cfg_get_string(_sg_cfg_set, "network/model");
- cpu_model_name = xbt_cfg_get_string(_sg_cfg_set, "cpu/model");
- storage_model_name = xbt_cfg_get_string(_sg_cfg_set, "storage/model");
-
- /* Check whether we use a net/cpu model differing from the default ones, in which case
- * we should switch to the "compound" host model to correctly dispatch stuff to
- * the right net/cpu models.
- */
-
- if ((!xbt_cfg_is_default_value(_sg_cfg_set, "network/model") ||
- !xbt_cfg_is_default_value(_sg_cfg_set, "cpu/model")) &&
- xbt_cfg_is_default_value(_sg_cfg_set, "host/model")) {
+ const char* host_model_name = xbt_cfg_get_string("host/model");
+ const char* network_model_name = xbt_cfg_get_string("network/model");
+ const char* cpu_model_name = xbt_cfg_get_string("cpu/model");
+ 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")) &&
+ xbt_cfg_is_default_value("host/model")) {
host_model_name = "compound";
- xbt_cfg_set_string(_sg_cfg_set, "host/model", host_model_name);
+ xbt_cfg_set_string("host/model", host_model_name);
}
XBT_DEBUG("host model: %s", host_model_name);
- host_id = find_model_description(surf_host_model_description, host_model_name);
if (!strcmp(host_model_name, "compound")) {
- int network_id = -1;
- int cpu_id = -1;
-
- xbt_assert(cpu_model_name,
- "Set a cpu model to use with the 'compound' host model");
+ 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");
- xbt_assert(network_model_name,
- "Set a network model to use with the 'compound' host model");
+ int cpu_id = find_model_description(surf_cpu_model_description, cpu_model_name);
+ surf_cpu_model_description[cpu_id].model_init_preparse();
- if(surf_cpu_model_init_preparse){
- surf_cpu_model_init_preparse();
- } else {
- cpu_id =
- find_model_description(surf_cpu_model_description, cpu_model_name);
- surf_cpu_model_description[cpu_id].model_init_preparse();
- }
-
- network_id =
- find_model_description(surf_network_model_description,
- network_model_name);
+ int network_id = find_model_description(surf_network_model_description, network_model_name);
surf_network_model_description[network_id].model_init_preparse();
}
XBT_DEBUG("Call host_model_init");
+ int host_id = find_model_description(surf_host_model_description, host_model_name);
surf_host_model_description[host_id].model_init_preparse();
XBT_DEBUG("Call vm_model_init");
- vm_id = find_model_description(surf_vm_model_description, vm_model_name);
- surf_vm_model_description[vm_id].model_init_preparse();
+ surf_vm_model_init_HL13();
XBT_DEBUG("Call storage_model_init");
- storage_id = find_model_description(surf_storage_model_description, storage_model_name);
+ int storage_id = find_model_description(surf_storage_model_description, storage_model_name);
surf_storage_model_description[storage_id].model_init_preparse();
-
}
/**
- * \brief Make a new routing component to the platform
+ * \brief Add an AS to the platform
*
* Add a new autonomous system to the platform. Any elements (such as host,
* router or sub-AS) added after this call and before the corresponding call
* Once this function was called, the configuration concerning the used
* models cannot be changed anymore.
*
- * @param AS_id name of this autonomous system. Must be unique in the platform
- * @param wanted_routing_type one of Full, Floyd, Dijkstra or similar. Full list in the variable routing_models, in src/surf/surf_routing.c
+ * @param AS the parameters defining the AS to build.
*/
simgrid::s4u::As * sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS)
{
surf_config_models_setup();
}
- xbt_assert(nullptr == xbt_lib_get_or_null(as_router_lib, AS->id, ROUTING_ASR_LEVEL),
- "Refusing to create a second AS called \"%s\".", AS->id);
-
_sg_cfg_init_status = 2; /* HACK: direct access to the global controlling the level of configuration to prevent
* any further config now that we created some real content */
/* search the routing model */
- simgrid::surf::AsImpl *new_as = NULL;
+ simgrid::kernel::routing::AsImpl *new_as = nullptr;
switch(AS->routing){
- case A_surfxml_AS_routing_Cluster: new_as = new simgrid::surf::AsCluster(AS->id); break;
- case A_surfxml_AS_routing_ClusterTorus: new_as = new simgrid::surf::AsClusterTorus(AS->id); break;
- case A_surfxml_AS_routing_ClusterFatTree: new_as = new simgrid::surf::AsClusterFatTree(AS->id); break;
- case A_surfxml_AS_routing_Dijkstra: new_as = new simgrid::surf::AsDijkstra(AS->id, 0); break;
- case A_surfxml_AS_routing_DijkstraCache: new_as = new simgrid::surf::AsDijkstra(AS->id, 1); break;
- case A_surfxml_AS_routing_Floyd: new_as = new simgrid::surf::AsFloyd(AS->id); break;
- case A_surfxml_AS_routing_Full: new_as = new simgrid::surf::AsFull(AS->id); break;
- case A_surfxml_AS_routing_None: new_as = new simgrid::surf::AsNone(AS->id); break;
- case A_surfxml_AS_routing_Vivaldi: new_as = new simgrid::surf::AsVivaldi(AS->id); break;
- default: xbt_die("Not a valid model!"); break;
+ case A_surfxml_AS_routing_Cluster:
+ new_as = new simgrid::kernel::routing::AsCluster(current_routing, AS->id);
+ break;
+ case A_surfxml_AS_routing_ClusterDragonfly:
+ new_as = new simgrid::kernel::routing::AsClusterDragonfly(current_routing, AS->id);
+ break;
+ case A_surfxml_AS_routing_ClusterTorus:
+ new_as = new simgrid::kernel::routing::AsClusterTorus(current_routing, AS->id);
+ break;
+ case A_surfxml_AS_routing_ClusterFatTree:
+ new_as = new simgrid::kernel::routing::AsClusterFatTree(current_routing, AS->id);
+ break;
+ case A_surfxml_AS_routing_Dijkstra:
+ new_as = new simgrid::kernel::routing::AsDijkstra(current_routing, AS->id, 0);
+ break;
+ case A_surfxml_AS_routing_DijkstraCache:
+ new_as = new simgrid::kernel::routing::AsDijkstra(current_routing, AS->id, 1);
+ break;
+ case A_surfxml_AS_routing_Floyd:
+ new_as = new simgrid::kernel::routing::AsFloyd(current_routing, AS->id);
+ break;
+ case A_surfxml_AS_routing_Full:
+ new_as = new simgrid::kernel::routing::AsFull(current_routing, AS->id);
+ break;
+ case A_surfxml_AS_routing_None:
+ new_as = new simgrid::kernel::routing::AsNone(current_routing, AS->id);
+ break;
+ case A_surfxml_AS_routing_Vivaldi:
+ new_as = new simgrid::kernel::routing::AsVivaldi(current_routing, AS->id);
+ break;
+ default:
+ xbt_die("Not a valid model!");
+ break;
}
- /* make a new routing component */
- simgrid::surf::NetCard *netcard = new simgrid::surf::NetCardImpl(new_as->name(), simgrid::surf::NetCard::Type::As, current_routing);
+ if (current_routing == nullptr) { /* it is the first one */
+ xbt_assert(simgrid::s4u::Engine::instance()->pimpl->rootAs_ == nullptr,
+ "All defined components must belong to a AS");
+ simgrid::s4u::Engine::instance()->pimpl->rootAs_ = new_as;
- if (current_routing == NULL && routing_platf->root_ == NULL) { /* it is the first one */
- routing_platf->root_ = new_as;
- } else if (current_routing != NULL && routing_platf->root_ != NULL) {
-
- xbt_assert(!xbt_dict_get_or_null(current_routing->children(), AS->id),
- "The AS \"%s\" already exists", AS->id);
- /* it is a part of the tree */
- new_as->father_ = current_routing;
+ } else {
/* set the father behavior */
- if (current_routing->hierarchy_ == simgrid::surf::AsImpl::RoutingMode::unset)
- current_routing->hierarchy_ = simgrid::surf::AsImpl::RoutingMode::recursive;
+ if (current_routing->hierarchy_ == simgrid::kernel::routing::AsImpl::RoutingMode::unset)
+ current_routing->hierarchy_ = simgrid::kernel::routing::AsImpl::RoutingMode::recursive;
/* add to the sons dictionary */
- xbt_dict_set(current_routing->children(), AS->id, (void *) new_as, NULL);
- } else {
- THROWF(arg_error, 0, "All defined components must belong to a AS");
+ xbt_dict_set(current_routing->children(), AS->id, (void *) new_as, nullptr);
}
- xbt_lib_set(as_router_lib, netcard->name(), ROUTING_ASR_LEVEL, (void *) netcard);
- XBT_DEBUG("Having set name '%s' id '%d'", new_as->name(), netcard->id());
-
/* set the new current component of the tree */
current_routing = new_as;
- current_routing->netcard_ = netcard;
- simgrid::surf::asCreatedCallbacks(new_as);
+ simgrid::kernel::routing::asCreatedCallbacks(new_as);
if (TRACE_is_enabled())
sg_instr_AS_begin(AS);
{
xbt_assert(current_routing, "Cannot seal the current AS: none under construction");
current_routing->seal();
- current_routing = static_cast<simgrid::surf::AsImpl*>(current_routing->father());
+ current_routing = static_cast<simgrid::kernel::routing::AsImpl*>(current_routing->father());
if (TRACE_is_enabled())
sg_instr_AS_end();
/** @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::surf::NetCard *netcard = sg_host_by_name(hostlink->id)->pimpl_netcard;
+ simgrid::kernel::routing::NetCard *netcard = sg_host_by_name(hostlink->id)->pimpl_netcard;
xbt_assert(netcard, "Host '%s' not found!", hostlink->id);
- xbt_assert(dynamic_cast<simgrid::surf::AsCluster*>(current_routing),
+ xbt_assert(dynamic_cast<simgrid::kernel::routing::AsCluster*>(current_routing),
"Only hosts from Cluster and Vivaldi ASes can get an host_link.");
s_surf_parsing_link_up_down_t link_up_down;
- link_up_down.link_up = Link::byName(hostlink->link_up);
- link_up_down.link_down = Link::byName(hostlink->link_down);
+ link_up_down.linkUp = Link::byName(hostlink->link_up);
+ link_up_down.linkDown = Link::byName(hostlink->link_down);
+
+ xbt_assert(link_up_down.linkUp, "Link '%s' not found!",hostlink->link_up);
+ xbt_assert(link_up_down.linkDown, "Link '%s' not found!",hostlink->link_down);
- xbt_assert(link_up_down.link_up, "Link '%s' not found!",hostlink->link_up);
- xbt_assert(link_up_down.link_down, "Link '%s' not found!",hostlink->link_down);
+ auto as_cluster = static_cast<simgrid::kernel::routing::AsCluster*>(current_routing);
- // If dynar is is greater than netcard id and if the host_link is already defined
- auto as_cluster = static_cast<simgrid::surf::AsCluster*>(current_routing);
- if((int)xbt_dynar_length(as_cluster->privateLinks_) > netcard->id() &&
- xbt_dynar_get_as(as_cluster->privateLinks_, netcard->id(), void*))
- surf_parse_error("Host_link for '%s' is already defined!",hostlink->id);
+ if (as_cluster->privateLinks_.find(netcard->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->name(), netcard->id());
- xbt_dynar_set_as(as_cluster->privateLinks_, netcard->id(), s_surf_parsing_link_up_down_t, link_up_down);
+ XBT_DEBUG("Push Host_link for host '%s' to position %d", netcard->name().c_str(), netcard->id());
+ as_cluster->privateLinks_.insert({netcard->id(), link_up_down});
}
