#include "simgrid/platf_interface.h" // platform creation API internal interface
#include "simgrid/sg_config.h"
#include "storage_interface.hpp"
-
+#include "src/surf/platform.hpp"
#include "surf/surfxml_parse_values.h"
/*************
namespace simgrid {
namespace surf {
-simgrid::surf::signal<void(simgrid::surf::NetCard*)> routingEdgeCreatedCallbacks;
-simgrid::surf::signal<void(simgrid::surf::As*)> asCreatedCallbacks;
+simgrid::xbt::signal<void(simgrid::surf::NetCard*)> netcardCreatedCallbacks;
+simgrid::xbt::signal<void(simgrid::surf::As*)> asCreatedCallbacks;
}
}
static xbt_dict_t random_value = NULL;
-/** @brief Retrieve a routing edge from its name
+/** @brief Retrieve a netcard from its name
*
- * Routing edges are either host and routers, whatever
+ * Netcards are the thing that connect host or routers to the network
*/
-simgrid::surf::NetCard *sg_routing_edge_by_name_or_null(const char *name)
+simgrid::surf::NetCard *sg_netcard_by_name_or_null(const char *name)
{
sg_host_t h = sg_host_by_name(name);
- simgrid::surf::NetCard *net_elm = h==NULL?NULL: sg_host_edge(h);
+ simgrid::surf::NetCard *net_elm = h==NULL?NULL: h->pimpl_netcard;
if (!net_elm)
- net_elm = (simgrid::surf::NetCard*) xbt_lib_get_or_null(as_router_lib, name, ROUTING_ASR_LEVEL);
+ net_elm = (simgrid::surf::NetCard*) xbt_lib_get_or_null(as_router_lib, name, ROUTING_ASR_LEVEL);
return net_elm;
}
return current_routing;
}
-// static void routing_parse_Srandom(void); /* random bypass */
-
static void routing_parse_postparse(void);
/* this lines are only for replace use like index in the model table */
};
/**
- * \brief Add a "host_link" to the network element list
+ * \brief Add a netcard connecting an host to the network element list
+ * FIXME: integrate into host constructor
*/
-void sg_platf_new_host_link(sg_platf_host_link_cbarg_t host)
+void sg_platf_new_netcard(sg_platf_host_link_cbarg_t netcard)
{
- simgrid::surf::NetCard *info = sg_host_edge(sg_host_by_name(host->id));
- xbt_assert(info, "Host '%s' not found!", host->id);
+ simgrid::surf::NetCard *info = sg_host_by_name(netcard->id)->pimpl_netcard;
+ xbt_assert(info, "Host '%s' not found!", netcard->id);
xbt_assert(current_routing->p_modelDesc == &routing_models[SURF_MODEL_CLUSTER] ||
current_routing->p_modelDesc == &routing_models[SURF_MODEL_VIVALDI],
"You have to be in model Cluster to use tag host_link!");
s_surf_parsing_link_up_down_t link_up_down;
- link_up_down.link_up = Link::byName(host->link_up);
- link_up_down.link_down = Link::byName(host->link_down);
+ link_up_down.link_up = Link::byName(netcard->link_up);
+ link_up_down.link_down = Link::byName(netcard->link_down);
- xbt_assert(link_up_down.link_up, "Link '%s' not found!",host->link_up);
- xbt_assert(link_up_down.link_down, "Link '%s' not found!",host->link_down);
+ xbt_assert(link_up_down.link_up, "Link '%s' not found!",netcard->link_up);
+ xbt_assert(link_up_down.link_down, "Link '%s' not found!",netcard->link_down);
if(!current_routing->p_linkUpDownList)
current_routing->p_linkUpDownList = xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL);
- // If dynar is is greater than edge id and if the host_link is already defined
+ // If dynar is is greater than netcard id and if the host_link is already defined
if((int)xbt_dynar_length(current_routing->p_linkUpDownList) > info->getId() &&
xbt_dynar_get_as(current_routing->p_linkUpDownList, info->getId(), void*))
- surf_parse_error("Host_link for '%s' is already defined!",host->id);
+ surf_parse_error("Host_link for '%s' is already defined!",netcard->id);
XBT_DEBUG("Push Host_link for host '%s' to position %d", info->getName(), info->getId());
xbt_dynar_set_as(current_routing->p_linkUpDownList, info->getId(), s_surf_parsing_link_up_down_t, link_up_down);
xbt_assert(!sg_host_by_name(host->id),
"Reading a host, processing unit \"%s\" already exists", host->id);
- simgrid::surf::NetCard *routingEdge =
- new simgrid::surf::RoutingEdgeImpl(xbt_strdup(host->id),
+ simgrid::surf::NetCard *netcard =
+ new simgrid::surf::NetCardImpl(xbt_strdup(host->id),
-1,
SURF_NETWORK_ELEMENT_HOST,
current_routing);
- routingEdge->setId(current_routing->parsePU(routingEdge));
+ netcard->setId(current_routing->parsePU(netcard));
sg_host_t h = sg_host_by_name_or_create(host->id);
- sg_host_edge_set(h, routingEdge);
- XBT_DEBUG("Having set name '%s' id '%d'", host->id, routingEdge->getId());
- simgrid::surf::routingEdgeCreatedCallbacks(routingEdge);
+ h->pimpl_netcard = netcard;
+ XBT_DEBUG("Having set name '%s' id '%d'", host->id, netcard->getId());
+ simgrid::surf::netcardCreatedCallbacks(netcard);
if(mount_list){
xbt_lib_set(storage_lib, host->id, ROUTING_STORAGE_HOST_LEVEL, (void *) mount_list);
XBT_DEBUG("Having set host coordinates for '%s'",host->id);
}
- return routingEdge;
-}
-
-/**
- * \brief Store the ASroute by calling the set_ASroute function of the current routing component
- */
-static void parse_E_ASroute(sg_platf_route_cbarg_t ASroute)
-{
- /*FIXME:REMOVE:xbt_assert(current_routing->parse_ASroute,
- "no defined method \"set_ASroute\" in \"%s\"",
- current_routing->name);*/
- current_routing->parseASroute(ASroute);
+ return netcard;
}
void sg_platf_new_trace(sg_platf_trace_cbarg_t trace)
tmgr_trace_t tmgr_trace;
if (!trace->file || strcmp(trace->file, "") != 0) {
tmgr_trace = tmgr_trace_new_from_file(trace->file);
- } else if (strcmp(trace->pc_data, "") == 0) {
- tmgr_trace = NULL;
} else {
- tmgr_trace =
- tmgr_trace_new_from_string(trace->id, trace->pc_data,
- trace->periodicity);
+ xbt_assert(strcmp(trace->pc_data, ""),
+ "Trace '%s' must have either a content, or point to a file on disk.",trace->id);
+ tmgr_trace = tmgr_trace_new_from_string(trace->id, trace->pc_data, trace->periodicity);
}
xbt_dict_set(traces_set_list, trace->id, (void *) tmgr_trace, NULL);
}
void sg_platf_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect)
{
- xbt_assert(xbt_dict_get_or_null
- (traces_set_list, trace_connect->trace),
+ xbt_assert(xbt_dict_get_or_null(traces_set_list, trace_connect->trace),
"Cannot connect trace %s to %s: trace unknown",
trace_connect->trace,
trace_connect->element);
new_as->p_name = xbt_strdup(AS->id);
simgrid::surf::NetCard *info =
- new simgrid::surf::RoutingEdgeImpl(xbt_strdup(new_as->p_name),
+ new simgrid::surf::NetCardImpl(xbt_strdup(new_as->p_name),
-1,
SURF_NETWORK_ELEMENT_AS,
current_routing);
/* set the new current component of the tree */
current_routing = new_as;
- current_routing->p_netElem = info;
+ current_routing->p_netcard = info;
- simgrid::surf::routingEdgeCreatedCallbacks(info);
+ simgrid::surf::netcardCreatedCallbacks(info);
simgrid::surf::asCreatedCallbacks(new_as);
}
route.link_list = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
// Find the net_card corresponding to father
- simgrid::surf::NetCard *src_father_net_elm = src_father->p_netElem;
- simgrid::surf::NetCard *dst_father_net_elm = dst_father->p_netElem;
+ simgrid::surf::NetCard *src_father_netcard = src_father->p_netcard;
+ simgrid::surf::NetCard *dst_father_netcard = dst_father->p_netcard;
- common_father->getRouteAndLatency(src_father_net_elm, dst_father_net_elm,
+ common_father->getRouteAndLatency(src_father_netcard, dst_father_netcard,
&route, latency);
xbt_assert((route.gw_src != NULL) && (route.gw_dst != NULL),
if (dst_gateway_net_elm != dst)
_get_route_and_latency(dst_gateway_net_elm, dst, links, latency);
- // if vivaldi latency+=vivaldi(src_gateway,dst_gateway)
}
AS_t surf_platf_get_root(routing_platf_t platf){
return platf->p_root;
}
-e_surf_network_element_type_t surf_routing_edge_get_rc_type(sg_netcard_t edge){
- return edge->getRcType();
+e_surf_network_element_type_t surf_routing_edge_get_rc_type(sg_netcard_t netcard){
+ return netcard->getRcType();
}
namespace simgrid {
* \pre route!=NULL
*
* walk through the routing components tree and find a route between hosts
- * by calling the differents "get_route" functions in each routing component.
+ * by calling each "get_route" function in each routing component.
*/
-void RoutingPlatf::getRouteAndLatency(
- simgrid::surf::NetCard *src, simgrid::surf::NetCard *dst,
- xbt_dynar_t* route, double *latency)
+void RoutingPlatf::getRouteAndLatency(NetCard *src, NetCard *dst, xbt_dynar_t* route, double *latency)
{
XBT_DEBUG("routing_get_route_and_latency from %s to %s", src->getName(), dst->getName());
- if (!*route) {
+ if (NULL == *route) {
xbt_dynar_reset(routing_platf->p_lastRoute);
*route = routing_platf->p_lastRoute;
}
e_surf_network_element_type_t routing_get_network_element_type(const char *name)
{
- simgrid::surf::NetCard *rc = sg_routing_edge_by_name_or_null(name);
+ simgrid::surf::NetCard *rc = sg_netcard_by_name_or_null(name);
if (rc)
return rc->getRcType();
}
s_sg_platf_host_cbarg_t host = SG_PLATF_HOST_INITIALIZER;
memset(&host, 0, sizeof(host));
- host.initial_state = SURF_RESOURCE_ON;
+ host.initiallyOn = 1;
host.pstate = 0;
host.speed_scale = 1.0;
host.core_amount = 1;
s_sg_platf_link_cbarg_t link = SG_PLATF_LINK_INITIALIZER;
memset(&link, 0, sizeof(link));
- link.state = SURF_RESOURCE_ON;
+ link.initiallyOn = 1;
link.policy = SURF_LINK_FULLDUPLEX;
link.latency = cabinet->lat;
link.bandwidth = cabinet->bw;
host_link.id = host_id;
host_link.link_up = link_up;
host_link.link_down = link_down;
- sg_platf_new_host_link(&host_link);
+ sg_platf_new_netcard(&host_link);
free(host_id);
free(link_id);
//host.power_peak = cluster->power;
host.speed_scale = 1.0;
host.core_amount = cluster->core_amount;
- host.initial_state = SURF_RESOURCE_ON;
+ host.initiallyOn = 1;
host.coord = "";
sg_platf_new_host(&host);
xbt_dynar_free(&host.speed_peak);
link.id = tmp_link;
link.bandwidth = cluster->loopback_bw;
link.latency = cluster->loopback_lat;
- link.state = SURF_RESOURCE_ON;
+ link.initiallyOn = 1;
link.policy = SURF_LINK_FATPIPE;
sg_platf_new_link(&link);
info_loop.link_up = Link::byName(tmp_link);
link.id = tmp_link;
link.bandwidth = cluster->limiter_link;
link.latency = 0;
- link.state = SURF_RESOURCE_ON;
+ link.initiallyOn = 1;
link.policy = SURF_LINK_SHARED;
sg_platf_new_link(&link);
info_lim.link_up = Link::byName(tmp_link);
link.id = link_backbone;
link.bandwidth = cluster->bb_bw;
link.latency = cluster->bb_lat;
- link.state = SURF_RESOURCE_ON;
+ link.initiallyOn = 1;
link.policy = cluster->bb_sharing_policy;
sg_platf_new_link(&link);
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.initial_state = SURF_RESOURCE_ON;
+ host.initiallyOn = 1;
host.id = host_id;
host.speed_peak = xbt_dynar_new(sizeof(double), NULL);
s_sg_platf_link_cbarg_t link = SG_PLATF_LINK_INITIALIZER;
memset(&link, 0, sizeof(link));
- link.state = SURF_RESOURCE_ON;
+ link.initiallyOn = 1;
link.policy = SURF_LINK_SHARED;
link.latency = peer->lat;
host_link.id = host_id;
host_link.link_up = link_up;
host_link.link_down = link_down;
- sg_platf_new_host_link(&host_link);
+ sg_platf_new_netcard(&host_link);
XBT_DEBUG("<router id=\"%s\"/>", router_id);
s_sg_platf_router_cbarg_t router = SG_PLATF_ROUTER_INITIALIZER;
xbt_lib_foreach(storage_lib, cursor, key, data) {
if(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != NULL) {
simgrid::surf::Storage *storage = static_cast<simgrid::surf::Storage*>(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL));
- host_elm = sg_routing_edge_by_name_or_null(storage->p_attach);
+ host_elm = sg_netcard_by_name_or_null(storage->p_attach);
if(!host_elm)
surf_parse_error("Unable to attach storage %s: host %s doesn't exist.", storage->getName(), storage->p_attach);
}
void routing_register_callbacks()
{
- sg_platf_postparse_add_cb(routing_parse_postparse);
- sg_platf_postparse_add_cb(check_disk_attachment);
+ simgrid::surf::on_postparse.connect(routing_parse_postparse);
+ simgrid::surf::on_postparse.connect(check_disk_attachment);
instr_routing_define_callbacks();
}
for (int index = 0; index < count; index++) {
sg_netcard_t relm =
xbt_dynar_get_as(elms, index, simgrid::surf::NetCard*);
- sg_host_t delm = simgrid::Host::by_name_or_null(relm->getName());
+ sg_host_t delm = simgrid::s4u::Host::by_name_or_null(relm->getName());
if (delm!=NULL) {
xbt_dynar_push(res, &delm);
}
