#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/AsClusterDragonfly.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/AsImpl.hpp"
+#include "src/kernel/routing/AsCluster.hpp"
+#include "src/kernel/routing/AsClusterTorus.hpp"
+#include "src/kernel/routing/AsClusterFatTree.hpp"
+#include "src/kernel/routing/AsClusterDragonfly.hpp"
+#include "src/kernel/routing/AsDijkstra.hpp"
+#include "src/kernel/routing/AsFloyd.hpp"
+#include "src/kernel/routing/AsFull.hpp"
+#include "src/kernel/routing/AsNone.hpp"
+#include "src/kernel/routing/AsVivaldi.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);
/** The current AS in the parsing */
-static simgrid::routing::AsImpl *current_routing = nullptr;
-static simgrid::routing::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();
{
xbt_assert(sg_host_by_name(host->id) == nullptr, "Refusing to create a second host named '%s'.", host->id);
- simgrid::routing::AsImpl* current_routing = routing_get_current();
- if (current_routing->hierarchy_ == simgrid::routing::AsImpl::RoutingMode::unset)
- current_routing->hierarchy_ = simgrid::routing::AsImpl::RoutingMode::base;
+ simgrid::kernel::routing::AsImpl* current_routing = routing_get_current();
+ if (current_routing->hierarchy_ == simgrid::kernel::routing::AsImpl::RoutingMode::unset)
+ current_routing->hierarchy_ = simgrid::kernel::routing::AsImpl::RoutingMode::base;
- simgrid::routing::NetCard *netcard =
- new simgrid::routing::NetCardImpl(host->id, simgrid::routing::NetCard::Type::Host, current_routing);
+ simgrid::kernel::routing::NetCard *netcard =
+ new simgrid::kernel::routing::NetCardImpl(host->id, simgrid::kernel::routing::NetCard::Type::Host, current_routing);
sg_host_t h = simgrid::s4u::Host::by_name_or_create(host->id);
h->pimpl_netcard = netcard;
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);
+ 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)
/** @brief Add a "router" to the network element list */
void sg_platf_new_router(sg_platf_router_cbarg_t router)
{
- simgrid::routing::AsImpl* current_routing = routing_get_current();
+ using simgrid::kernel::routing::AsCluster;
+ simgrid::kernel::routing::AsImpl* current_routing = routing_get_current();
- if (current_routing->hierarchy_ == simgrid::routing::AsImpl::RoutingMode::unset)
- current_routing->hierarchy_ = simgrid::routing::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::routing::NetCard* netcard =
- new simgrid::routing::NetCardImpl(router->id, simgrid::routing::NetCard::Type::Router, current_routing);
+ simgrid::kernel::routing::NetCard* netcard =
+ new simgrid::kernel::routing::NetCardImpl(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());
xbt_lib_set(as_router_lib, router->id, COORD_ASR_LEVEL, (void *) ctn);
}
+ auto cluster = dynamic_cast<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);
}
void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster)
{
- using simgrid::routing::AsCluster;
- using simgrid::routing::AsClusterTorus;
- using simgrid::routing::AsClusterFatTree;
- using simgrid::routing::AsCluster;
- using simgrid::routing::AsClusterTorus;
- using simgrid::routing::AsClusterDragonfly;
- using simgrid::routing::AsClusterFatTree;
+ using simgrid::kernel::routing::AsCluster;
+ using simgrid::kernel::routing::AsClusterDragonfly;
+ using simgrid::kernel::routing::AsClusterFatTree;
+ using simgrid::kernel::routing::AsClusterTorus;
int rankId=0;
break;
}
sg_platf_new_AS_begin(&AS);
- simgrid::routing::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){
}
}
- host.speed_per_pstate = xbt_dynar_new(sizeof(double), nullptr);
- 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.
// the first column may store a link from x to x if p_has_loopback is set
link.latency = cluster->loopback_lat;
link.policy = SURF_LINK_FATPIPE;
sg_platf_new_link(&link);
- info_loop.linkUp = info_loop.linkDown = 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->linkCountPerNode_, &info_loop);
+ if (rankId*as_cluster->linkCountPerNode_ >= as_cluster->privateLinks_.size())
+ as_cluster->privateLinks_.resize(rankId*as_cluster->linkCountPerNode_,{nullptr, nullptr});
+ as_cluster->privateLinks_.insert(as_cluster->privateLinks_.begin() + rankId*as_cluster->linkCountPerNode_,
+ info_loop);
}
//add a limiter link (shared link to account for maximal bandwidth of the node)
sg_platf_new_link(&link);
info_lim.linkUp = info_lim.linkDown = Link::byName(tmp_link);
free(tmp_link);
- xbt_dynar_set(current_as->privateLinks_, rankId * current_as->linkCountPerNode_ + current_as->hasLoopback_ , &info_lim);
+ current_as->privateLinks_.insert(current_as->privateLinks_.begin() + rankId * current_as->linkCountPerNode_ +
+ current_as->hasLoopback_ , info_lim);
}
//call the cluster function that adds the others links
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::routing::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
simgrid::surf::on_cluster(cluster);
}
void routing_cluster_add_backbone(simgrid::surf::Link* bb) {
- simgrid::routing::AsCluster *cluster = dynamic_cast<simgrid::routing::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());
host.pstate = 0;
host.core_amount = 1;
host.id = hostname;
- host.speed_per_pstate = xbt_dynar_new(sizeof(double), nullptr);
- 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));
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;
- std::function<void()> code = simgrid::xbt::wrapMain(parse_code, process->argc, process->argv);
+ 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_process_t process_created = nullptr;
+ smx_actor_t process_created = nullptr;
arg = new simgrid::simix::ProcessArg();
arg->name = std::string(process->argv[0]);
void sg_platf_new_peer(sg_platf_peer_cbarg_t peer)
{
- using simgrid::routing::NetCard;
- using simgrid::routing::AsCluster;
+ using simgrid::kernel::routing::NetCard;
+ using simgrid::kernel::routing::AsCluster;
char *host_id = bprintf("peer_%s", peer->id);
char *router_id = bprintf("router_%s", peer->id);
memset(&host, 0, sizeof(host));
host.id = host_id;
- host.speed_per_pstate = xbt_dynar_new(sizeof(double), nullptr);
- xbt_dynar_push(host.speed_per_pstate,&peer->speed);
+ host.speed_per_pstate.push_back(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));
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();
/* search the routing model */
- simgrid::routing::AsImpl *new_as = nullptr;
+ simgrid::kernel::routing::AsImpl *new_as = nullptr;
switch(AS->routing){
- case A_surfxml_AS_routing_Cluster: new_as = new simgrid::routing::AsCluster(AS->id); break;
- case A_surfxml_AS_routing_ClusterDragonfly: new_as = new simgrid::routing::AsClusterDragonfly(AS->id); break;
- case A_surfxml_AS_routing_ClusterTorus: new_as = new simgrid::routing::AsClusterTorus(AS->id); break;
- case A_surfxml_AS_routing_ClusterFatTree: new_as = new simgrid::routing::AsClusterFatTree(AS->id); break;
- case A_surfxml_AS_routing_Dijkstra: new_as = new simgrid::routing::AsDijkstra(AS->id, 0); break;
- case A_surfxml_AS_routing_DijkstraCache: new_as = new simgrid::routing::AsDijkstra(AS->id, 1); break;
- case A_surfxml_AS_routing_Floyd: new_as = new simgrid::routing::AsFloyd(AS->id); break;
- case A_surfxml_AS_routing_Full: new_as = new simgrid::routing::AsFull(AS->id); break;
- case A_surfxml_AS_routing_None: new_as = new simgrid::routing::AsNone(AS->id); break;
- case A_surfxml_AS_routing_Vivaldi: new_as = new simgrid::routing::AsVivaldi(AS->id); break;
+ case A_surfxml_AS_routing_Cluster: new_as = new simgrid::kernel::routing::AsCluster(AS->id); break;
+ case A_surfxml_AS_routing_ClusterDragonfly: new_as = new simgrid::kernel::routing::AsClusterDragonfly(AS->id); break;
+ case A_surfxml_AS_routing_ClusterTorus: new_as = new simgrid::kernel::routing::AsClusterTorus(AS->id); break;
+ case A_surfxml_AS_routing_ClusterFatTree: new_as = new simgrid::kernel::routing::AsClusterFatTree(AS->id); break;
+ case A_surfxml_AS_routing_Dijkstra: new_as = new simgrid::kernel::routing::AsDijkstra(AS->id, 0); break;
+ case A_surfxml_AS_routing_DijkstraCache: new_as = new simgrid::kernel::routing::AsDijkstra(AS->id, 1); break;
+ case A_surfxml_AS_routing_Floyd: new_as = new simgrid::kernel::routing::AsFloyd(AS->id); break;
+ case A_surfxml_AS_routing_Full: new_as = new simgrid::kernel::routing::AsFull(AS->id); break;
+ case A_surfxml_AS_routing_None: new_as = new simgrid::kernel::routing::AsNone(AS->id); break;
+ case A_surfxml_AS_routing_Vivaldi: new_as = new simgrid::kernel::routing::AsVivaldi(AS->id); break;
default: xbt_die("Not a valid model!"); break;
}
/* make a new routing component */
- simgrid::routing::NetCard *netcard = new simgrid::routing::NetCardImpl(new_as->name(), simgrid::routing::NetCard::Type::As, current_routing);
+ simgrid::kernel::routing::NetCard *netcard = new simgrid::kernel::routing::NetCardImpl(new_as->name(), simgrid::kernel::routing::NetCard::Type::As, current_routing);
if (current_routing == nullptr && routing_platf->root_ == nullptr) { /* it is the first one */
routing_platf->root_ = new_as;
/* it is a part of the tree */
new_as->father_ = current_routing;
/* set the father behavior */
- if (current_routing->hierarchy_ == simgrid::routing::AsImpl::RoutingMode::unset)
- current_routing->hierarchy_ = simgrid::routing::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, nullptr);
} else {
current_routing = new_as;
current_routing->netcard_ = netcard;
- simgrid::routing::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::routing::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::routing::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::routing::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;
xbt_assert(link_up_down.linkDown, "Link '%s' not found!",hostlink->link_down);
// If dynar is is greater than netcard id and if the host_link is already defined
- auto as_cluster = static_cast<simgrid::routing::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);
-
+ auto as_cluster = static_cast<simgrid::kernel::routing::AsCluster*>(current_routing);
+ if (as_cluster->privateLinks_.size() > netcard->id()){
+ if (as_cluster->privateLinks_.at(netcard->id()).linkUp != nullptr)
+ surf_parse_error("Host_link for '%s' is already defined!",hostlink->id);
+ } else {
+ as_cluster->privateLinks_.resize(netcard->id(), {nullptr, nullptr});
+ }
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);
+ as_cluster->privateLinks_.insert(as_cluster->privateLinks_.begin() + netcard->id(), link_up_down);
}
