#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/surf_routing_cluster.hpp"
-#include "src/surf/surf_routing_cluster_torus.hpp"
-#include "src/surf/surf_routing_cluster_fat_tree.hpp"
+
+#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"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);
static int surf_parse_models_setup_already_called = 0;
+/** The current AS in the parsing */
+static simgrid::surf::AsImpl *current_routing = NULL;
+static simgrid::surf::AsImpl* routing_get_current()
+{
+ return current_routing;
+}
+
/** Module management function: creates all internal data structures */
void sg_platf_init(void) {
}
/** @brief Add an "host" to the current AS */
void sg_platf_new_host(sg_platf_host_cbarg_t host)
{
- xbt_assert(! sg_host_by_name(host->id),
- "Refusing to create a second host named '%s'.", host->id);
+ xbt_assert(! sg_host_by_name(host->id), "Refusing to create a second host named '%s'.", host->id);
- simgrid::s4u::As* current_routing = routing_get_current();
- if (current_routing->hierarchy_ == simgrid::s4u::As::ROUTING_NULL)
- current_routing->hierarchy_ = simgrid::s4u::As::ROUTING_BASE;
+ 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;
simgrid::surf::NetCard *netcard =
new simgrid::surf::NetCardImpl(host->id, SURF_NETWORK_ELEMENT_HOST, current_routing);
unsigned int cursor;
char*str;
- if (!COORD_HOST_LEVEL)
- xbt_die ("To use host coordinates, please add --cfg=network/coordinates:yes to your command line");
+ 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_dynar_t ctn = xbt_dynar_new(sizeof(double),NULL);
XBT_DEBUG("Having set host coordinates for '%s'",host->id);
}
-
simgrid::surf::Cpu *cpu = surf_cpu_model_pm->createCpu( h,
- host->speed_peak,
- host->speed_trace,
- host->core_amount,
- host->state_trace);
+ 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, host->properties)->attach(h);
if (host->pstate != 0)
*/
void sg_platf_new_router(sg_platf_router_cbarg_t router)
{
- simgrid::s4u::As* current_routing = routing_get_current();
+ simgrid::surf::AsImpl* current_routing = routing_get_current();
- if (current_routing->hierarchy_ == simgrid::s4u::As::ROUTING_NULL)
- current_routing->hierarchy_ = simgrid::s4u::As::ROUTING_BASE;
+ if (current_routing->hierarchy_ == simgrid::surf::AsImpl::RoutingMode::unset)
+ current_routing->hierarchy_ = simgrid::surf::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, SURF_NETWORK_ELEMENT_ROUTER, current_routing);
+ simgrid::surf::NetCard *netcard =
+ new simgrid::surf::NetCardImpl(router->id, SURF_NETWORK_ELEMENT_ROUTER, current_routing);
netcard->setId(current_routing->addComponent(netcard));
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());
}
void sg_platf_new_link(sg_platf_link_cbarg_t link){
+ std::vector<char*> names;
+
+ if (link->policy == SURF_LINK_FULLDUPLEX) {
+ names.push_back(bprintf("%s_UP", link->id));
+ names.push_back(bprintf("%s_DOWN", link->id));
+ } else {
+ 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);
+
+ if (link->latency_trace)
+ l->setLatencyTrace(link->latency_trace);
+ if (link->bandwidth_trace)
+ l->setBandwidthTrace(link->bandwidth_trace);
+ if (link->state_trace)
+ l->setStateTrace(link->state_trace);
+
+ xbt_free(link_name);
+ }
+
simgrid::surf::on_link(link);
}
// What an inventive way of initializing the AS that I have as ancestor :-(
sg_platf_new_AS_begin(&AS);
- simgrid::s4u::As *current_routing = routing_get_current();
+ simgrid::surf::AsImpl *current_routing = routing_get_current();
static_cast<AsCluster*>(current_routing)->parse_specific_arguments(cluster);
if(cluster->loopback_bw!=0 || cluster->loopback_lat!=0){
xbt_dict_set(patterns, "radical", bprintf("%d", i), NULL);
char *avail_file = xbt_str_varsubst(cluster->availability_trace, patterns);
XBT_DEBUG("\tavailability_file=\"%s\"", avail_file);
- host.speed_trace = tmgr_trace_new_from_file(avail_file);
+ if (avail_file && avail_file[0])
+ host.speed_trace = tmgr_trace_new_from_file(avail_file);
xbt_free(avail_file);
} else {
XBT_DEBUG("\tavailability_file=\"\"");
if (cluster->state_trace && strcmp(cluster->state_trace, "")) {
char *avail_file = xbt_str_varsubst(cluster->state_trace, patterns);
XBT_DEBUG("\tstate_file=\"%s\"", avail_file);
- host.state_trace = tmgr_trace_new_from_file(avail_file);
+ if (avail_file && avail_file[0])
+ host.state_trace = tmgr_trace_new_from_file(avail_file);
xbt_free(avail_file);
} else {
XBT_DEBUG("\tstate_file=\"\"");
}
- host.speed_peak = xbt_dynar_new(sizeof(double), NULL);
- xbt_dynar_push(host.speed_peak,&cluster->speed);
+ host.speed_per_pstate = xbt_dynar_new(sizeof(double), NULL);
+ xbt_dynar_push(host.speed_per_pstate,&cluster->speed);
host.pstate = 0;
//host.power_peak = cluster->power;
host.core_amount = cluster->core_amount;
host.coord = "";
sg_platf_new_host(&host);
- xbt_dynar_free(&host.speed_peak);
+ xbt_dynar_free(&host.speed_per_pstate);
XBT_DEBUG("</host>");
XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%f\"\tlat=\"%f\"/>", link_id,
simgrid::surf::on_cluster(cluster);
}
+void routing_cluster_add_backbone(simgrid::surf::Link* bb) {
+ simgrid::surf::AsCluster *cluster = dynamic_cast<simgrid::surf::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());
+
+ cluster->backbone_ = bb;
+ XBT_DEBUG("Add a backbone to AS '%s'", current_routing->name());
+}
+
+void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet)
+{
+ int start, end, i;
+ char *groups , *host_id , *link_id = NULL;
+ unsigned int iter;
+ xbt_dynar_t radical_elements;
+ xbt_dynar_t radical_ends;
+
+ //Make all hosts
+ radical_elements = xbt_str_split(cabinet->radical, ",");
+ xbt_dynar_foreach(radical_elements, iter, groups) {
+
+ radical_ends = xbt_str_split(groups, "-");
+ start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *));
+
+ 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");
+ break;
+ }
+ s_sg_platf_host_cbarg_t host = SG_PLATF_HOST_INITIALIZER;
+ memset(&host, 0, sizeof(host));
+ host.pstate = 0;
+ host.core_amount = 1;
+
+ s_sg_platf_link_cbarg_t link = SG_PLATF_LINK_INITIALIZER;
+ memset(&link, 0, sizeof(link));
+ link.policy = SURF_LINK_FULLDUPLEX;
+ link.latency = cabinet->lat;
+ link.bandwidth = cabinet->bw;
+
+ s_sg_platf_host_link_cbarg_t host_link = SG_PLATF_HOST_LINK_INITIALIZER;
+ memset(&host_link, 0, sizeof(host_link));
+
+ for (i = start; i <= end; i++) {
+ host_id = bprintf("%s%d%s",cabinet->prefix,i,cabinet->suffix);
+ link_id = bprintf("link_%s%d%s",cabinet->prefix,i,cabinet->suffix);
+ host.id = host_id;
+ link.id = link_id;
+ host.speed_per_pstate = xbt_dynar_new(sizeof(double), NULL);
+ xbt_dynar_push(host.speed_per_pstate,&cabinet->speed);
+ sg_platf_new_host(&host);
+ xbt_dynar_free(&host.speed_per_pstate);
+ sg_platf_new_link(&link);
+
+ char* link_up = bprintf("%s_UP",link_id);
+ char* link_down = bprintf("%s_DOWN",link_id);
+ host_link.id = host_id;
+ host_link.link_up = link_up;
+ host_link.link_down = link_down;
+ sg_platf_new_hostlink(&host_link);
+
+ free(host_id);
+ free(link_id);
+ free(link_up);
+ free(link_down);
+ }
+
+ xbt_dynar_free(&radical_ends);
+ }
+ xbt_dynar_free(&radical_elements);
+}
void sg_platf_new_storage(sg_platf_storage_cbarg_t storage)
{
storage->type_id,
storage->content);
- xbt_lib_set(storage_lib,
- storage->id,
- ROUTING_STORAGE_LEVEL,
- (void *) xbt_strdup(storage->type_id));
+ xbt_lib_set(storage_lib, storage->id, ROUTING_STORAGE_LEVEL, (void *) xbt_strdup(storage->type_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,"")){
current_property_set = NULL;
}
+void sg_platf_new_peer(sg_platf_peer_cbarg_t peer)
+{
+ using simgrid::surf::NetCard;
+ using simgrid::surf::AsCluster;
+
+ char *host_id = NULL;
+ char *link_id = NULL;
+ char *router_id = NULL;
+
+ XBT_DEBUG(" ");
+ host_id = bprintf("peer_%s", peer->id);
+ link_id = bprintf("link_%s", peer->id);
+ router_id = bprintf("router_%s", peer->id);
+
+ XBT_DEBUG("<AS id=\"%s\"\trouting=\"Cluster\">", peer->id);
+ s_sg_platf_AS_cbarg_t AS = SG_PLATF_AS_INITIALIZER;
+ 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 = SG_PLATF_HOST_INITIALIZER;
+ 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.power_peak = peer->power;
+ 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 = SG_PLATF_LINK_INITIALIZER;
+ memset(&link, 0, sizeof(link));
+ link.policy = SURF_LINK_SHARED;
+ link.latency = peer->lat;
+
+ char* link_up = bprintf("%s_UP",link_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("%s_DOWN",link_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 = SG_PLATF_HOST_LINK_INITIALIZER;
+ 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);
+
+ XBT_DEBUG("<router id=\"%s\"/>", router_id);
+ s_sg_platf_router_cbarg_t router = SG_PLATF_ROUTER_INITIALIZER;
+ 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_end();
+ XBT_DEBUG(" ");
+
+ //xbt_dynar_free(&tab_elements_num);
+ free(router_id);
+ free(host_id);
+ free(link_id);
+ free(link_up);
+ free(link_down);
+}
+
void sg_platf_begin() { /* Do nothing: just for symmetry of user code */ }
void sg_platf_end() {
}
+/**
+ * \brief Make a new routing component 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
+ * to sg_platf_new_AS_close() will be added to this AS.
+ *
+ * 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
+ */
void sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS)
{
if (!surf_parse_models_setup_already_called) {
* I'm not sure for <trace> and <trace_connect>, there may be a bug here
* (FIXME: check it out by creating a file beginning with one of these tags)
* but cluster and peer create ASes internally, so putting the code in there is ok.
- *
- * TODO, There used to be a guard protecting here against
- * xbt_dynar_length(sg_platf_AS_begin_cb_list) because we don't want to
- * initialize the models if we are parsing the file to get the deployment.
- * That could happen if the same file would be used for platf and deploy:
- * it'd contain AS tags even during the deploy parsing. Removing that guard
- * would result of the models to get re-inited when parsing for deploy.
- * Currently using the same file for platform and deployment is broken
- * however. This guard will have to ba adapted in order to make this feature
- * work again.
*/
surf_parse_models_setup_already_called = 1;
surf_config_models_setup();
}
- routing_AS_begin(AS);
+ 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;
+ 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;
+ }
+
+ /* make a new routing component */
+ simgrid::surf::NetCard *netcard = new simgrid::surf::NetCardImpl(new_as->name(), SURF_NETWORK_ELEMENT_AS, current_routing);
+
+ if (current_routing == NULL && routing_platf->root_ == NULL) {
+ /* it is the first one */
+ routing_platf->root_ = new_as;
+ netcard->setId(-1);
+ } 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;
+ /* set the father behavior */
+ if (current_routing->hierarchy_ == simgrid::surf::AsImpl::RoutingMode::unset)
+ current_routing->hierarchy_ = simgrid::surf::AsImpl::RoutingMode::recursive;
+ /* add to the sons dictionary */
+ xbt_dict_set(current_routing->children(), AS->id, (void *) new_as, NULL);
+ /* add to the father element list */
+ netcard->setId(current_routing->addComponent(netcard));
+ } else {
+ THROWF(arg_error, 0, "All defined components must belong to a AS");
+ }
+
+ 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::netcardCreatedCallbacks(netcard);
+ simgrid::surf::asCreatedCallbacks(new_as);
if (TRACE_is_enabled())
sg_instr_AS_begin(AS);
}
+/**
+ * \brief Specify that the current description of AS is finished
+ *
+ * Once you've declared all the content of your AS, you have to close
+ * it with this call. Your AS is not usable until you call this function.
+ */
void sg_platf_new_AS_end()
{
- routing_AS_end();
+ 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());
+
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 netcard_arg)
+{
+ simgrid::surf::NetCard *netcard = sg_host_by_name(netcard_arg->id)->pimpl_netcard;
+ xbt_assert(netcard, "Host '%s' not found!", netcard_arg->id);
+ xbt_assert(dynamic_cast<simgrid::surf::AsCluster*>(current_routing) ||
+ dynamic_cast<simgrid::surf::AsVivaldi*>(current_routing),
+ "Only hosts from Cluster and Vivaldi ASes can get a host_link.");
+
+ s_surf_parsing_link_up_down_t link_up_down;
+ link_up_down.link_up = Link::byName(netcard_arg->link_up);
+ link_up_down.link_down = Link::byName(netcard_arg->link_down);
+
+ xbt_assert(link_up_down.link_up, "Link '%s' not found!",netcard_arg->link_up);
+ xbt_assert(link_up_down.link_down, "Link '%s' not found!",netcard_arg->link_down);
+
+ // If dynar is is greater than netcard id and if the host_link is already defined
+ if((int)xbt_dynar_length(current_routing->upDownLinks) > netcard->id() &&
+ xbt_dynar_get_as(current_routing->upDownLinks, netcard->id(), void*))
+ surf_parse_error("Host_link for '%s' is already defined!",netcard_arg->id);
+
+ XBT_DEBUG("Push Host_link for host '%s' to position %d", netcard->name(), netcard->id());
+ xbt_dynar_set_as(current_routing->upDownLinks, netcard->id(), s_surf_parsing_link_up_down_t, link_up_down);
+}
