#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/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/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/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);
if (args->pstate != 0)
host->pimpl_cpu->setPState(args->pstate);
if (args->coord && strcmp(args->coord, ""))
- new simgrid::kernel::routing::vivaldi::Coords(host, args->coord);
+ new simgrid::kernel::routing::vivaldi::Coords(host->pimpl_netcard, args->coord);
simgrid::s4u::Host::onCreation(*host);
/** @brief Add a "router" to the network element list */
void sg_platf_new_router(sg_platf_router_cbarg_t router)
{
- using simgrid::kernel::routing::AsCluster;
simgrid::kernel::routing::AsImpl* current_routing = routing_get_current();
if (current_routing->hierarchy_ == simgrid::kernel::routing::AsImpl::RoutingMode::unset)
"Refusing to create a router named '%s': this name already describes a node.", router->id);
simgrid::kernel::routing::NetCard* netcard =
- new simgrid::kernel::routing::NetCardImpl(router->id, simgrid::kernel::routing::NetCard::Type::Router, current_routing);
+ 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),nullptr);
- 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<AsCluster*>(current_routing);
+ 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 ((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);
}
}
XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%f\"\tlat=\"%f\"/>", link_id, cluster->bw, cluster->lat);
- 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
// 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){
char *tmp_link = bprintf("%s_loopback", link_id);
XBT_DEBUG("<loopback\tid=\"%s\"\tbw=\"%f\"/>", tmp_link, cluster->loopback_bw);
link.latency = cluster->loopback_lat;
link.policy = SURF_LINK_FATPIPE;
sg_platf_new_link(&link);
- info_loop.linkUp = Link::byName(tmp_link);
- info_loop.linkDown = Link::byName(tmp_link);
+ linkUp = Link::byName(tmp_link);
+ linkDown = Link::byName(tmp_link);
free(tmp_link);
auto as_cluster = static_cast<AsCluster*>(current_as);
- as_cluster->privateLinks_.insert({rankId*as_cluster->linkCountPerNode_, info_loop});
+ as_cluster->privateLinks_.insert({rankId * as_cluster->linkCountPerNode_, {linkUp, linkDown}});
}
//add a limiter link (shared link to account for maximal bandwidth of the node)
+ 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);
link.latency = 0;
link.policy = SURF_LINK_SHARED;
sg_platf_new_link(&link);
- info_lim.linkUp = info_lim.linkDown = Link::byName(tmp_link);
+ linkUp = linkDown = Link::byName(tmp_link);
free(tmp_link);
current_as->privateLinks_.insert(
- {rankId * current_as->linkCountPerNode_ + current_as->hasLoopback_ , info_lim});
+ {rankId * current_as->linkCountPerNode_ + current_as->hasLoopback_, {linkUp, linkDown}});
}
//call the cluster function that adds the others links
simgrid::s4u::Host* host;
unsigned int cursor;
xbt_dynar_foreach(all_hosts,cursor, host) {
- xbt_strbuff_append(msg,host->name().c_str());
+ xbt_strbuff_append(msg, host->cname());
xbt_strbuff_append(msg,"', '");
if (msg->used > 1024) {
msg->data[msg->used-3]='\0';
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->name().c_str(), start_time);
+ 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(),
void sg_platf_new_peer(sg_platf_peer_cbarg_t peer)
{
- 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);
-
- 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;
+ simgrid::kernel::routing::AsVivaldi* as = dynamic_cast<simgrid::kernel::routing::AsVivaldi*>(current_routing);
+ xbt_assert(as, "<peer> tag can only be used in Vivaldi ASes");
- 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);
-
- 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);
+ std::vector<double> speedPerPstate;
+ speedPerPstate.push_back(peer->speed);
+ simgrid::s4u::Host* host = as->createHost(peer->id, &speedPerPstate, 1);
- XBT_DEBUG("</AS>");
- sg_platf_new_AS_seal();
- XBT_DEBUG(" ");
+ as->setPeerLink(host->pimpl_netcard, peer->bw_in, peer->bw_out, peer->lat, peer->coord);
+ simgrid::s4u::Host::onCreation(*host);
- free(router_id);
- free(host_id);
+ /* Change from the defaults */
+ if (peer->state_trace)
+ host->pimpl_cpu->setStateTrace(peer->state_trace);
+ if (peer->speed_trace)
+ host->pimpl_cpu->setSpeedTrace(peer->speed_trace);
}
void sg_platf_begin() { /* Do nothing: just for symmetry of user code */ }
static void surf_config_models_setup()
{
const char* host_model_name = xbt_cfg_get_string("host/model");
- const char* vm_model_name = xbt_cfg_get_string("vm/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");
surf_host_model_description[host_id].model_init_preparse();
XBT_DEBUG("Call vm_model_init");
- int 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");
int storage_id = find_model_description(surf_storage_model_description, storage_model_name);
break;
}
+ 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 == nullptr && routing_platf->root_ == nullptr) { /* it is the first one */
- routing_platf->root_ = new_as;
-
- } else if (current_routing != nullptr && routing_platf->root_ != nullptr) {
+ } else {
/* set the father behavior */
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 {
- THROWF(arg_error, 0, "All defined components must belong to a AS");
}
/* set the new current component of the tree */
current_routing = new_as;
- simgrid::kernel::routing::asCreatedCallbacks(new_as);
if (TRACE_is_enabled())
sg_instr_AS_begin(AS);
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.linkUp = Link::byName(hostlink->link_up);
- link_up_down.linkDown = Link::byName(hostlink->link_down);
+ simgrid::surf::Link* linkUp = Link::byName(hostlink->link_up);
+ simgrid::surf::Link* 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(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::AsCluster*>(current_routing);
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().c_str(), netcard->id());
- as_cluster->privateLinks_.insert({netcard->id(), link_up_down});
+ XBT_DEBUG("Push Host_link for host '%s' to position %d", netcard->cname(), netcard->id());
+ as_cluster->privateLinks_.insert({netcard->id(), {linkUp, linkDown}});
}
