From 2b9f74737bbd837c728884a5ba7d0a4f02bca79d Mon Sep 17 00:00:00 2001 From: Jonathan Rouzaud-Cornabas Date: Thu, 7 Feb 2013 15:04:11 +0100 Subject: [PATCH] Add a new simcall that modifies the rate of the first smx_action_t on smx_rdv_t --- include/simgrid/simix.h | 1 + src/simix/smx_user.c | 23 ++++++++ src/surf/surf_routing.c | 1 + src/surf/surf_routing_cluster.c | 99 ++++++++++++++++++++++++++++++--- src/surf/surf_routing_private.h | 1 + 5 files changed, 118 insertions(+), 7 deletions(-) diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index b22e1e8c3c..5a0dfde3fd 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -409,6 +409,7 @@ XBT_PUBLIC(smx_action_t) simcall_comm_irecv(smx_rdv_t rdv, void *dst_buff, XBT_PUBLIC(void) simcall_comm_destroy(smx_action_t comm); XBT_PUBLIC(smx_action_t) simcall_comm_iprobe(smx_rdv_t rdv, int src, int tag, int (*match_fun)(void *, void *, smx_action_t), void *data); +XBT_PUBLIC(double) simcall_comm_change_rate_first_action(smx_rdv_t rdv, double newrate); XBT_PUBLIC(void) simcall_comm_cancel(smx_action_t comm); /* FIXME: waitany is going to be a vararg function, and should take a timeout */ diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c index b9099f5877..3d17a0522d 100644 --- a/src/simix/smx_user.c +++ b/src/simix/smx_user.c @@ -735,6 +735,29 @@ smx_action_t simcall_comm_irecv(smx_rdv_t rdv, void *dst_buff, size_t *dst_buff_ } +/** + * \ingroup simix_comm_management + */ +double simcall_comm_change_rate_first_action(smx_rdv_t rdv, double newrate) +{ + xbt_assert(rdv, "No rendez-vous point defined for change_rate_first_action"); + + smx_action_t action; + xbt_fifo_item_t item; + + item = xbt_fifo_get_first_item(rdv->comm_fifo); + if (item != NULL) { + action = (smx_action_t) xbt_fifo_get_item_content(item); + if (action->comm.rate > newrate) { + action->comm.rate = newrate; + return newrate; + } else + return action->comm.rate; + } else + return -1.0; +} + + /** * \ingroup simix_comm_management */ diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index cf77d3191d..8e25069cc7 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -920,6 +920,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 diff --git a/src/surf/surf_routing_cluster.c b/src/surf/surf_routing_cluster.c index d30c073d5c..ab45c3f4bb 100644 --- a/src/surf/surf_routing_cluster.c +++ b/src/surf/surf_routing_cluster.c @@ -64,12 +64,99 @@ static void cluster_get_route_and_latency(AS_t as, static void cluster_get_graph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges, AS_t rc) { - int isrc = 0, idst; + int isrc; int table_size = xbt_dynar_length(rc->index_network_elm); sg_routing_edge_t src, dst; - xbt_node_t current, previous, revCurrent, revPrevious; + xbt_node_t current, previous, backboneNode,routerNode; + s_surf_parsing_link_up_down_t info; + + xbt_assert(((as_cluster_t) rc)->router,"Malformed cluster"); + + /* create the router */ + char *link_name = + ((sg_routing_edge_t) ((as_cluster_t) rc)->router)->name; + routerNode = new_xbt_graph_node(graph, link_name, nodes); + + if(((as_cluster_t) rc)->backbone) { + char *link_nameR = + ((surf_resource_t) ((as_cluster_t) rc)->backbone)->name; + backboneNode = new_xbt_graph_node(graph, link_nameR, nodes); + + new_xbt_graph_edge(graph, routerNode, backboneNode, edges); + } + + for (isrc = 0; isrc < table_size; isrc++) { + src = xbt_dynar_get_as(rc->index_network_elm, isrc, sg_routing_edge_t); + + if (src->rc_type != SURF_NETWORK_ELEMENT_ROUTER) { + previous = new_xbt_graph_node(graph, src->name, nodes); + + info = xbt_dynar_get_as(rc->link_up_down_list, src->id, + s_surf_parsing_link_up_down_t); + + if (info.link_up) { // link up + char *link_name = ((surf_resource_t) info.link_up)->name; + current = new_xbt_graph_node(graph, link_name, nodes); + new_xbt_graph_edge(graph, previous, current, edges); + + if (((as_cluster_t) rc)->backbone) { + new_xbt_graph_edge(graph, current, backboneNode, edges); + } else { + new_xbt_graph_edge(graph, current, routerNode, edges); + } + + } + + if (info.link_down) { // link down + char *link_name = ((surf_resource_t) info.link_down)->name; + current = new_xbt_graph_node(graph, link_name, nodes); + new_xbt_graph_edge(graph, previous, current, edges); + + if (((as_cluster_t) rc)->backbone) { + new_xbt_graph_edge(graph, current, backboneNode, edges); + } else { + new_xbt_graph_edge(graph, current, routerNode, edges); + } + + } + } + } + +/* + if (((as_cluster_t) rc)->backbone) { + char *link_name = + ((surf_resource_t) ((as_cluster_t) rc)->backbone)->name; + + current = new_xbt_graph_node(graph, link_name, nodes); + new_xbt_graph_edge(graph, previous, current, edges); + previous = current; + + revCurrent = new_xbt_graph_node(graph, link_name, nodes); + new_xbt_graph_edge(graph, revCurrent, revPrevious, edges); + revPrevious = revCurrent; + } else { + info = xbt_dynar_get_as(rc->link_up_down_list, dst->id, + s_surf_parsing_link_up_down_t); + + if (info.link_up) { // link up + char *link_name = ((surf_resource_t) info.link_up)->name; + current = new_xbt_graph_node(graph, link_name, nodes); + new_xbt_graph_edge(graph, previous, current, edges); + previous = current; + } else if (info.link_down) { // link down + char *link_name = ((surf_resource_t) info.link_down)->name; + revCurrent = new_xbt_graph_node(graph, link_name, nodes); + new_xbt_graph_edge(graph, revCurrent, revPrevious, edges); + revPrevious = revCurrent; + } + } + + } + }*/ +/* + if(rc->) for (isrc = 0; isrc < table_size; isrc++) { src = xbt_dynar_get_as(rc->index_network_elm, isrc, sg_routing_edge_t); @@ -79,10 +166,6 @@ static void cluster_get_graph(xbt_graph_t graph, xbt_dict_t nodes, for (idst = isrc + 1; idst < table_size; idst++) { dst = xbt_dynar_get_as(rc->index_network_elm, idst, sg_routing_edge_t); - sg_platf_route_cbarg_t route = xbt_new0(s_sg_platf_route_cbarg_t, 1); - route->link_list = xbt_dynar_new(sizeof(sg_routing_link_t), NULL); - rc->get_route_and_latency(rc, src, dst, route, NULL); - s_surf_parsing_link_up_down_t info; if (src->rc_type != SURF_NETWORK_ELEMENT_ROUTER) { // No specific link for router @@ -103,6 +186,8 @@ static void cluster_get_graph(xbt_graph_t graph, xbt_dict_t nodes, } } + + if (((as_cluster_t) rc)->backbone) { char *link_name = ((surf_resource_t) ((as_cluster_t) rc)->backbone)->name; @@ -135,7 +220,7 @@ static void cluster_get_graph(xbt_graph_t graph, xbt_dict_t nodes, } } - } + }*/ } static void model_cluster_finalize(AS_t as) diff --git a/src/surf/surf_routing_private.h b/src/surf/surf_routing_private.h index ac4cbe3780..c1369d03d9 100644 --- a/src/surf/surf_routing_private.h +++ b/src/surf/surf_routing_private.h @@ -72,6 +72,7 @@ AS_t model_rulebased_create(void); /* create structures for rulebased routi typedef struct { s_as_t generic_routing; void *backbone; + sg_routing_edge_t router; } s_as_cluster_t, *as_cluster_t; AS_t model_cluster_create(void); /* create structures for cluster routing model */ -- 2.20.1