#include "xbt/dict.h"
#include "xbt/RngStream.h"
#include <xbt/signal.hpp>
+#include "src/surf/HostImpl.hpp"
#include "surf/surf.h"
#include "src/simix/smx_private.h"
#include "src/surf/xml/platf_private.hpp"
#include "src/surf/cpu_interface.hpp"
-#include "src/surf/host_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"
xbt_assert(! sg_host_by_name(host->id),
"Refusing to create a second host named '%s'.", host->id);
- simgrid::surf::As* current_routing = routing_get_current();
- if (current_routing->hierarchy_ == SURF_ROUTING_NULL)
- current_routing->hierarchy_ = SURF_ROUTING_BASE;
+ 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::NetCard *netcard =
new simgrid::surf::NetCardImpl(host->id, SURF_NETWORK_ELEMENT_HOST, current_routing);
*/
void sg_platf_new_router(sg_platf_router_cbarg_t router)
{
- simgrid::surf::As* current_routing = routing_get_current();
+ simgrid::s4u::As* current_routing = routing_get_current();
- if (current_routing->hierarchy_ == SURF_ROUTING_NULL)
- current_routing->hierarchy_ = SURF_ROUTING_BASE;
+ if (current_routing->hierarchy_ == simgrid::s4u::As::ROUTING_NULL)
+ current_routing->hierarchy_ = simgrid::s4u::As::ROUTING_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);
// What an inventive way of initializing the AS that I have as ancestor :-(
sg_platf_new_AS_begin(&AS);
- simgrid::surf::As *current_routing = routing_get_current();
+ simgrid::s4u::As *current_routing = routing_get_current();
static_cast<AsCluster*>(current_routing)->parse_specific_arguments(cluster);
if(cluster->loopback_bw!=0 || cluster->loopback_lat!=0){
info_loop.link_up = Link::byName(tmp_link);
info_loop.link_down = info_loop.link_up;
free(tmp_link);
- xbt_dynar_set(current_routing->upDownLinks,
- rankId*(static_cast<AsCluster*>(current_routing))->nb_links_per_node_, &info_loop);
+ xbt_dynar_set(current_routing->upDownLinks, rankId*(static_cast<AsCluster*>(current_routing))->nb_links_per_node_, &info_loop);
}
//add a limiter link (shared link to account for maximal bandwidth of the node)
info_lim.link_down = info_lim.link_up;
free(tmp_link);
auto as_cluster = static_cast<AsCluster*>(current_routing);
- xbt_dynar_set(current_routing->upDownLinks,
- rankId*(as_cluster)->nb_links_per_node_ + as_cluster->has_loopback_ ,
- &info_lim);
+ xbt_dynar_set(current_routing->upDownLinks, rankId*(as_cluster)->nb_links_per_node_ + as_cluster->has_loopback_ , &info_lim);
}