* Callbacks *
*************/
-static void replace_bdw_ns3(char ** bdw)
-{
- char *temp = xbt_strdup(*bdw);
- xbt_free(*bdw);
- *bdw = bprintf("%fBps",atof(temp));
- xbt_free(temp);
-
-}
-
-static void replace_lat_ns3(char ** lat)
-{
- char *temp = xbt_strdup(*lat);
- xbt_free(*lat);
- *lat = bprintf("%fs",atof(temp));
- xbt_free(temp);
-}
-
static void simgrid_ns3_add_host(simgrid::s4u::Host& host)
{
const char* id = host.name().c_str();
static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster)
{
- const char *cluster_prefix = cluster->prefix;
- const char *cluster_suffix = cluster->suffix;
- const char *cluster_radical = cluster->radical;
- const char *cluster_bb_bw = bprintf("%f",cluster->bb_bw);
- const char *cluster_bb_lat = bprintf("%f",cluster->bb_lat);
- const char *cluster_bw = bprintf("%f",cluster->bw);
- const char *cluster_lat = bprintf("%f",cluster->lat);
const char *groups = NULL;
int start, end, i;
char *router_id,*host_id;
- radical_elements = xbt_str_split(cluster_radical, ",");
+ radical_elements = xbt_str_split(cluster->radical, ",");
xbt_dynar_foreach(radical_elements, iter, groups) {
radical_ends = xbt_str_split(groups, "-");
case 1:
start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *));
xbt_dynar_push_as(tab_elements_num, int, start);
- router_id = bprintf("ns3_%s%d%s", cluster_prefix, start, cluster_suffix);
+ router_id = bprintf("ns3_%s%d%s", cluster->prefix, start, cluster->suffix);
simgrid::s4u::Host::by_name_or_create(router_id)
->extension_set(NS3_EXTENSION_ID, ns3_add_host_cluster(router_id));
XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id);
end = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 1, char *));
for (i = start; i <= end; i++){
xbt_dynar_push_as(tab_elements_num, int, i);
- router_id = bprintf("ns3_%s%d%s", cluster_prefix, i, cluster_suffix);
+ router_id = bprintf("ns3_%s%d%s", cluster->prefix, i, cluster->suffix);
simgrid::s4u::Host::by_name_or_create(router_id)
->extension_set(NS3_EXTENSION_ID, ns3_add_host_cluster(router_id));
XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id);
//Create links
unsigned int cpt;
int elmts;
- char * lat = xbt_strdup(cluster_lat);
- char * bw = xbt_strdup(cluster_bw);
- replace_lat_ns3(&lat);
- replace_bdw_ns3(&bw);
+ char * lat = bprintf("%fs", cluster->lat);
+ char * bw = bprintf("%fBps", cluster->bw);
xbt_dynar_foreach(tab_elements_num,cpt,elmts)
{
- host_id = bprintf("%s%d%s", cluster_prefix, elmts, cluster_suffix);
- router_id = bprintf("ns3_%s%d%s", cluster_prefix, elmts, cluster_suffix);
+ host_id = bprintf("%s%d%s", cluster->prefix, elmts, cluster->suffix);
+ router_id = bprintf("ns3_%s%d%s", cluster->prefix, elmts, cluster->suffix);
XBT_DEBUG("Create link from '%s' to '%s'",host_id,router_id);
ns3_nodes_t host_src = ns3_find_host(host_id);
free(router_id);
free(host_id);
}
+ xbt_free(lat);
+ xbt_free(bw);
xbt_dynar_free(&tab_elements_num);
//Create link backbone
- lat = xbt_strdup(cluster_bb_lat);
- bw = xbt_strdup(cluster_bb_bw);
- replace_lat_ns3(&lat);
- replace_bdw_ns3(&bw);
+ lat = bprintf("%fs", cluster->bb_lat);
+ bw = bprintf("%fBps", cluster->bb_bw);
ns3_add_cluster(bw,lat,cluster->id);
xbt_free(lat);
xbt_free(bw);
if (strcmp(src,dst) && link->m_created){
XBT_DEBUG("Route from '%s' to '%s' with link '%s'", src, dst, link->getName());
- char * link_bdw = xbt_strdup(link->p_bdw);
- char * link_lat = xbt_strdup(link->p_lat);
- replace_lat_ns3(&link_lat);
- replace_bdw_ns3(&link_bdw);
+ char * link_bdw = bprintf("%fBps", link->getBandwidth());
+ char * link_lat = bprintf("%fs", link->getLatency());
link->m_created = 0;
// XBT_DEBUG("src (%s), dst (%s), src_id = %d, dst_id = %d",src,dst, src_id, dst_id);
//create link ns3
ns3_nodes_t host_src = ns3_find_host(src);
- if(!host_src) host_src = static_cast<ns3_nodes_t>(xbt_lib_get_or_null(as_router_lib,src,NS3_ASR_LEVEL));
+ if (!host_src)
+ host_src = static_cast<ns3_nodes_t>(xbt_lib_get_or_null(as_router_lib,src,NS3_ASR_LEVEL));
ns3_nodes_t host_dst = ns3_find_host(dst);
- if(!host_dst) host_dst = static_cast<ns3_nodes_t>(xbt_lib_get_or_null(as_router_lib,dst,NS3_ASR_LEVEL));
+ if(!host_dst)
+ host_dst = static_cast<ns3_nodes_t>(xbt_lib_get_or_null(as_router_lib,dst,NS3_ASR_LEVEL));
- if(host_src && host_dst){}
- else xbt_die("\tns3_add_link from %d to %d",host_src->node_num,host_dst->node_num);
+ if (!host_src || !host_dst)
+ xbt_die("\tns3_add_link from %d to %d",host_src->node_num,host_dst->node_num);
ns3_add_link(host_src->node_num,host_src->type,host_dst->node_num,host_dst->type,link_bdw,link_lat);
NetworkNS3Link::NetworkNS3Link(NetworkNS3Model *model, const char *name, xbt_dict_t props,
double bw_initial, double lat_initial)
: Link(model, name, props)
- , p_lat(bprintf("%f", lat_initial))
- , p_bdw(bprintf("%f", bw_initial))
, m_created(1)
{
+ p_speed.scale = 1.0;
+ p_speed.peak = bw_initial;
+ m_latCurrent = lat_initial;
}
NetworkNS3Link::~NetworkNS3Link()