X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7a8cd62135619ad52e05ae1c929ef07e166e4260..8192acecf44818a829583724900211221500a718:/src/surf/surf_routing.c
diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index cf77d3191d..ae8e115f5a 100644
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -19,14 +19,15 @@ xbt_lib_t host_lib;
int ROUTING_HOST_LEVEL; //Routing level
int SURF_CPU_LEVEL; //Surf cpu level
int SURF_WKS_LEVEL; //Surf workstation level
-int SIMIX_HOST_LEVEL; //Simix level
-int MSG_HOST_LEVEL; //Msg level
-int SD_HOST_LEVEL; //Simdag level
+int SIMIX_HOST_LEVEL; //Simix host level
+int SIMIX_STORAGE_LEVEL; //Simix storage level
+int MSG_HOST_LEVEL; //Msg host level
+int MSG_STORAGE_LEVEL; //Msg storage level
+int SD_HOST_LEVEL; //Simdag host level
+int SD_STORAGE_LEVEL; //Simdag storage level
int COORD_HOST_LEVEL=0; //Coordinates level
int NS3_HOST_LEVEL; //host node for ns3
-xbt_dict_t watched_hosts_lib;
-
/**
* @ingroup SURF_build_api
* @brief A library containing all known links
@@ -75,7 +76,6 @@ typedef enum {
SURF_MODEL_DIJKSTRA,
SURF_MODEL_DIJKSTRACACHE,
SURF_MODEL_NONE,
- SURF_MODEL_RULEBASED,
SURF_MODEL_VIVALDI,
SURF_MODEL_CLUSTER
} e_routing_types;
@@ -95,8 +95,6 @@ struct s_model_type routing_models[] = {
model_dijkstracache_create, model_dijkstra_both_end},
{"none", "No routing (Unless you know what you are doing, avoid using this mode in combination with a non Constant network model).",
model_none_create, NULL},
- {"RuleBased", "Rule-Based routing data (...)",
- model_rulebased_create, NULL},
{"Vivaldi", "Vivaldi routing",
model_vivaldi_create, NULL},
{"Cluster", "Cluster routing",
@@ -119,6 +117,8 @@ static void parse_S_host_link(sg_platf_host_link_cbarg_t host)
s_surf_parsing_link_up_down_t link_up_down;
link_up_down.link_up = xbt_lib_get_or_null(link_lib, host->link_up, SURF_LINK_LEVEL);
link_up_down.link_down = xbt_lib_get_or_null(link_lib, host->link_down, SURF_LINK_LEVEL);
+ link_up_down.limiter_link = NULL;
+ link_up_down.loopback_link = NULL;
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);
@@ -354,7 +354,6 @@ void routing_AS_begin(sg_platf_AS_cbarg_t AS)
case A_surfxml_AS_routing_Floyd: model = &routing_models[SURF_MODEL_FLOYD];break;
case A_surfxml_AS_routing_Full: model = &routing_models[SURF_MODEL_FULL];break;
case A_surfxml_AS_routing_None: model = &routing_models[SURF_MODEL_NONE];break;
- case A_surfxml_AS_routing_RuleBased: model = &routing_models[SURF_MODEL_RULEBASED];break;
case A_surfxml_AS_routing_Vivaldi: model = &routing_models[SURF_MODEL_VIVALDI];break;
default: xbt_die("Not a valid model!!!");
break;
@@ -747,7 +746,7 @@ static void routing_parse_cabinet(sg_platf_cabinet_cbarg_t cabinet)
s_sg_platf_host_cbarg_t host;
memset(&host, 0, sizeof(host));
host.initial_state = SURF_RESOURCE_ON;
- host.power_peak = cabinet->power;
+ host.pstate = 0;
host.power_scale = 1.0;
host.core_amount = 1;
@@ -766,6 +765,9 @@ static void routing_parse_cabinet(sg_platf_cabinet_cbarg_t cabinet)
link_id = bprintf("link_%s%d%s",cabinet->prefix,i,cabinet->suffix);
host.id = host_id;
link.id = link_id;
+ xbt_dynar_t power_state_list = xbt_dynar_new(sizeof(double), NULL);
+ xbt_dynar_push(power_state_list,&cabinet->power);
+ host.power_peak = power_state_list;
sg_platf_new_host(&host);
sg_platf_new_link(&link);
@@ -863,7 +865,12 @@ static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster)
XBT_DEBUG("\tstate_file=\"\"");
}
- host.power_peak = cluster->power;
+ xbt_dynar_t power_state_list = xbt_dynar_new(sizeof(double), NULL);
+ xbt_dynar_push(power_state_list,&cluster->power);
+ host.power_peak = power_state_list;
+ host.pstate = 0;
+
+ //host.power_peak = cluster->power;
host.power_scale = 1.0;
host.core_amount = cluster->core_amount;
host.initial_state = SURF_RESOURCE_ON;
@@ -897,6 +904,47 @@ static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster)
info.link_up = xbt_lib_get_or_null(link_lib, link_id, SURF_LINK_LEVEL);
info.link_down = info.link_up;
}
+
+ if(cluster->limiter_link!=0){
+ char *tmp_link = bprintf("%s_limiter", link_id);
+ XBT_DEBUG("", tmp_link,
+ cluster->limiter_link);
+
+
+ memset(&link, 0, sizeof(link));
+ link.id = tmp_link;
+ link.bandwidth = cluster->limiter_link;
+ link.latency = 0;
+ link.state = SURF_RESOURCE_ON;
+ link.policy = SURF_LINK_SHARED;
+ sg_platf_new_link(&link);
+ info.limiter_link =
+ xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL);
+ free(tmp_link);
+ }else{
+ info.limiter_link =NULL;
+ }
+
+ if(cluster->loopback_bw!=0 || cluster->loopback_lat!=0){
+ char *tmp_link = bprintf("%s_loopback", link_id);
+ XBT_DEBUG("", tmp_link,
+ cluster->limiter_link);
+
+
+ memset(&link, 0, sizeof(link));
+ link.id = tmp_link;
+ link.bandwidth = cluster->loopback_bw;
+ link.latency = cluster->loopback_lat;
+ link.state = SURF_RESOURCE_ON;
+ link.policy = SURF_LINK_FATPIPE;
+ sg_platf_new_link(&link);
+ info.loopback_link =
+ xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL);
+ free(tmp_link);
+ }else{
+ info.loopback_link =NULL;
+ }
+
xbt_dynar_push(current_routing->link_up_down_list,&info);
xbt_free(link_id);
xbt_free(host_id);
@@ -920,6 +968,7 @@ static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster)
bprintf("%s%s_router%s", cluster->prefix, cluster->id,
cluster->suffix);
sg_platf_new_router(&router);
+ ((as_cluster_t)current_routing)->router = xbt_lib_get_or_null(as_router_lib, router.id, ROUTING_ASR_LEVEL);
free(newid);
//Make the backbone
@@ -955,23 +1004,38 @@ static void routing_parse_postparse(void) {
static void routing_parse_peer(sg_platf_peer_cbarg_t peer)
{
char *host_id = NULL;
- char *link_id;
+ char *link_id = NULL;
+ char *router_id = NULL;
XBT_DEBUG(" ");
host_id = HOST_PEER(peer->id);
link_id = LINK_PEER(peer->id);
+ router_id = ROUTER_PEER(peer->id);
+
+ XBT_DEBUG("", 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);
+
+ current_routing->link_up_down_list
+ = xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL);
XBT_DEBUG("", host_id, peer->power);
s_sg_platf_host_cbarg_t host;
memset(&host, 0, sizeof(host));
host.initial_state = SURF_RESOURCE_ON;
host.id = host_id;
- host.power_peak = peer->power;
+
+ xbt_dynar_t power_state_list = xbt_dynar_new(sizeof(double), NULL);
+ xbt_dynar_push(power_state_list,&peer->power);
+ host.power_peak = power_state_list;
+ host.pstate = 0;
+ //host.power_peak = peer->power;
host.power_scale = 1.0;
host.power_trace = peer->availability_trace;
host.state_trace = peer->state_trace;
host.core_amount = 1;
- host.coord = peer->coord;
sg_platf_new_host(&host);
s_sg_platf_link_cbarg_t link;
@@ -1002,9 +1066,20 @@ static void routing_parse_peer(sg_platf_peer_cbarg_t peer)
host_link.link_down= link_down;
sg_platf_new_host_link(&host_link);
+ XBT_DEBUG("", 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);
+ ((as_cluster_t)current_routing)->router = xbt_lib_get_or_null(as_router_lib, router.id, ROUTING_ASR_LEVEL);
+
+ XBT_DEBUG("");
+ 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);
@@ -1187,3 +1262,36 @@ void routing_exit(void) {
finalize_rec(routing_platf->root);
xbt_free(routing_platf);
}
+
+AS_t surf_AS_get_routing_root() {
+ return routing_platf->root;
+}
+
+const char *surf_AS_get_name(AS_t as) {
+ return as->name;
+}
+
+xbt_dict_t surf_AS_get_routing_sons(AS_t as) {
+ return as->routing_sons;
+}
+
+const char *surf_AS_get_model(AS_t as) {
+ return as->model_desc->name;
+}
+
+xbt_dynar_t surf_AS_get_hosts(AS_t as) {
+ xbt_dynar_t elms = as->index_network_elm;
+ sg_routing_edge_t relm;
+ xbt_dictelm_t delm;
+ int index;
+ int count = xbt_dynar_length(elms);
+ xbt_dynar_t res = xbt_dynar_new(sizeof(xbt_dictelm_t), NULL);
+ for (index = 0; index < count; index++) {
+ relm = xbt_dynar_get_as(elms, index, sg_routing_edge_t);
+ delm = xbt_lib_get_elm_or_null(host_lib, relm->name);
+ if (delm!=NULL) {
+ xbt_dynar_push(res, &delm);
+ }
+ }
+ return res;
+}