From: navarrop Date: Thu, 24 Mar 2011 10:35:36 +0000 (+0000) Subject: Remove resource_set from surf_model. X-Git-Tag: v3.6_beta2~139 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/47770f3f517351a06cd159b2e0f79f72461fbb34 Remove resource_set from surf_model. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9830 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/src/surf/network.c b/src/surf/network.c index 3864fd918e..b07cd755e3 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -173,8 +173,7 @@ static link_CM02_t net_link_new(char *name, state_initial, state_trace, bw_initial, bw_trace); - xbt_assert1(!xbt_dict_get_or_null - (surf_network_model->resource_set, name), + xbt_assert1(!xbt_lib_get_or_null(link_lib, name, SURF_LINK_LEVEL), "Link '%s' declared several times in the platform file.", name); @@ -186,8 +185,7 @@ static link_CM02_t net_link_new(char *name, if (policy == SURF_LINK_FATPIPE) lmm_constraint_shared(nw_link->lmm_resource.constraint); - xbt_dict_set(surf_network_model->resource_set, name, nw_link, - surf_resource_free); + xbt_lib_set(link_lib, name, SURF_LINK_LEVEL, nw_link); return nw_link; } @@ -277,7 +275,7 @@ static void net_add_traces(void) xbt_dict_foreach(trace_connect_list_link_avail, cursor, trace_name, elm) { tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name); link_CM02_t link = - xbt_dict_get_or_null(surf_network_model->resource_set, elm); + xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); xbt_assert2(link, "Cannot connect trace %s to link %s: link undefined", trace_name, elm); @@ -292,7 +290,7 @@ static void net_add_traces(void) xbt_dict_foreach(trace_connect_list_bandwidth, cursor, trace_name, elm) { tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name); link_CM02_t link = - xbt_dict_get_or_null(surf_network_model->resource_set, elm); + xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); xbt_assert2(link, "Cannot connect trace %s to link %s: link undefined", trace_name, elm); @@ -307,7 +305,7 @@ static void net_add_traces(void) xbt_dict_foreach(trace_connect_list_latency, cursor, trace_name, elm) { tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name); link_CM02_t link = - xbt_dict_get_or_null(surf_network_model->resource_set, elm); + xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); xbt_assert2(link, "Cannot connect trace %s to link %s: link undefined", trace_name, elm); diff --git a/src/surf/network_gtnets.c b/src/surf/network_gtnets.c index c317017237..34eaca4a01 100644 --- a/src/surf/network_gtnets.c +++ b/src/surf/network_gtnets.c @@ -23,7 +23,7 @@ static void link_new(char *name, double bw, double lat, xbt_dict_t props) static int link_count = -1; network_link_GTNETS_t gtnets_link; - if (xbt_dict_get_or_null(surf_network_model->resource_set, name)) { + if (xbt_lib_get_or_null(link_lib, name, SURF_LINK_LEVEL)) { return; } @@ -46,8 +46,7 @@ static void link_new(char *name, double bw, double lat, xbt_dict_t props) } gtnets_link->id = link_count; - xbt_dict_set(surf_network_model->resource_set, name, gtnets_link, - surf_resource_free); + xbt_lib_set(link_lib, name, SURF_LINK_LEVEL, gtnets_link); } static void route_new(int src_id, int dst_id, xbt_dynar_t links, diff --git a/src/surf/network_im.c b/src/surf/network_im.c index 643a76e0d6..82590fe2a9 100644 --- a/src/surf/network_im.c +++ b/src/surf/network_im.c @@ -170,8 +170,7 @@ static link_CM02_im_t im_net_link_new(char *name, state_initial, state_trace, bw_initial, bw_trace); - xbt_assert1(!xbt_dict_get_or_null - (surf_network_model->resource_set, name), + xbt_assert1(!xbt_lib_get_or_null(link_lib, name, SURF_LINK_LEVEL), "Link '%s' declared several times in the platform file.", name); @@ -183,8 +182,7 @@ static link_CM02_im_t im_net_link_new(char *name, if (policy == SURF_LINK_FATPIPE) lmm_constraint_shared(nw_link->lmm_resource.constraint); - xbt_dict_set(surf_network_model->resource_set, name, nw_link, - surf_resource_free); + xbt_lib_set(link_lib, name, SURF_LINK_LEVEL, nw_link); return nw_link; @@ -275,7 +273,7 @@ static void im_net_add_traces(void) xbt_dict_foreach(trace_connect_list_link_avail, cursor, trace_name, elm) { tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name); link_CM02_im_t link = - xbt_dict_get_or_null(surf_network_model->resource_set, elm); + xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); xbt_assert2(link, "Cannot connect trace %s to link %s: link undefined", trace_name, elm); @@ -290,7 +288,7 @@ static void im_net_add_traces(void) xbt_dict_foreach(trace_connect_list_bandwidth, cursor, trace_name, elm) { tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name); link_CM02_im_t link = - xbt_dict_get_or_null(surf_network_model->resource_set, elm); + xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); xbt_assert2(link, "Cannot connect trace %s to link %s: link undefined", trace_name, elm); @@ -305,7 +303,7 @@ static void im_net_add_traces(void) xbt_dict_foreach(trace_connect_list_latency, cursor, trace_name, elm) { tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name); link_CM02_im_t link = - xbt_dict_get_or_null(surf_network_model->resource_set, elm); + xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); xbt_assert2(link, "Cannot connect trace %s to link %s: link undefined", trace_name, elm); diff --git a/src/surf/surf_model.c b/src/surf/surf_model.c index 8800f71c34..028b732e67 100644 --- a/src/surf/surf_model.c +++ b/src/surf/surf_model.c @@ -34,7 +34,6 @@ surf_model_t surf_model_init(void) xbt_swag_new(xbt_swag_offset(action, state_hookup)); model->states.done_action_set = xbt_swag_new(xbt_swag_offset(action, state_hookup)); - model->resource_set = xbt_dict_new(); model->action_unref = int_die_impossible_paction; model->action_cancel = void_die_impossible_paction; diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index 2ac012e27b..97e3b96a44 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -1379,7 +1379,7 @@ static void model_full_set_route(routing_component_t rc, const char *src, xbt_dynar_t link_route_to_test = xbt_dynar_new(global_routing->size_of_link, NULL); xbt_dynar_foreach(route->generic_route.link_list,i,link_name) { - void *link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name); + void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL); xbt_assert1(link,"Link : '%s' doesn't exists.",link_name); xbt_dynar_push(link_route_to_test,&link); } @@ -1423,7 +1423,7 @@ static void model_full_set_route(routing_component_t rc, const char *src, for(i=xbt_dynar_length(route->generic_route.link_list) ;i>0 ;i--) { link_name = xbt_dynar_get_as(route->generic_route.link_list,i-1,void *); - void *link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name); + void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL); xbt_assert1(link,"Link : '%s' doesn't exists.",link_name); xbt_dynar_push(link_route_to_test,&link); } @@ -1751,7 +1751,7 @@ static void model_floyd_set_route(routing_component_t rc, const char *src, xbt_dynar_t link_route_to_test = xbt_dynar_new(global_routing->size_of_link, NULL); xbt_dynar_foreach(route->generic_route.link_list,cpt,link_name) { - void *link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name); + void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL); xbt_assert1(link,"Link : '%s' doesn't exists.",link_name); xbt_dynar_push(link_route_to_test,&link); } @@ -1796,7 +1796,7 @@ static void model_floyd_set_route(routing_component_t rc, const char *src, for(i=xbt_dynar_length(route->generic_route.link_list) ;i>0 ;i--) { link_name = xbt_dynar_get_as(route->generic_route.link_list,i-1,void *); - void *link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name); + void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL); xbt_assert1(link,"Link : '%s' doesn't exists.",link_name); xbt_dynar_push(link_route_to_test,&link); } @@ -2665,8 +2665,7 @@ static route_extended_t rulebased_get_route(routing_component_t rc, char *new_link_name = remplace(link_name, list_src, rc_src, list_dst, rc_dst); void *link = - xbt_dict_get_or_null(surf_network_model->resource_set, - new_link_name); + xbt_lib_get_or_null(link_lib, new_link_name, SURF_LINK_LEVEL); if (link) xbt_dynar_push(links_list, &link); else @@ -3135,7 +3134,7 @@ generic_new_route(e_surf_routing_hierarchy_t hierarchy, xbt_dynar_foreach(links, cpt, link_name) { void *link = - xbt_dict_get_or_null(surf_network_model->resource_set, link_name); + xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL); if (link) { if (order) xbt_dynar_push(links_id, &link); @@ -3191,7 +3190,7 @@ generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy, xbt_dynar_foreach(links, cpt, link_name) { void *link = - xbt_dict_get_or_null(surf_network_model->resource_set, link_name); + xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL); if (link) { if (order) xbt_dynar_push(links_id, &link); diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c index f5d3f528fc..595001eb7d 100644 --- a/src/surf/workstation_ptask_L07.c +++ b/src/surf/workstation_ptask_L07.c @@ -705,8 +705,7 @@ static link_L07_t ptask_link_new(char *name, policy, xbt_dict_t properties) { link_L07_t nw_link = xbt_new0(s_link_L07_t, 1); - xbt_assert1(!xbt_dict_get_or_null - (surf_network_model->resource_set, name), + xbt_assert1(!xbt_lib_get_or_null(link_lib, name, SURF_LINK_LEVEL), "Link '%s' declared several times in the platform file.", name); @@ -734,10 +733,7 @@ static link_L07_t ptask_link_new(char *name, if (policy == SURF_LINK_FATPIPE) lmm_constraint_shared(nw_link->constraint); - xbt_dict_set(surf_network_model->resource_set, name, nw_link, - surf_resource_free); - - + xbt_lib_set(link_lib, name, SURF_LINK_LEVEL, nw_link); return nw_link; } @@ -853,7 +849,7 @@ static void ptask_add_traces(void) xbt_dict_foreach(trace_connect_list_link_avail, cursor, trace_name, elm) { tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name); link_L07_t link = - xbt_dict_get_or_null(surf_network_model->resource_set, elm); + xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); xbt_assert1(link, "Link %s undefined", elm); xbt_assert1(trace, "Trace %s undefined", trace_name); @@ -865,7 +861,7 @@ static void ptask_add_traces(void) xbt_dict_foreach(trace_connect_list_bandwidth, cursor, trace_name, elm) { tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name); link_L07_t link = - xbt_dict_get_or_null(surf_network_model->resource_set, elm); + xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); xbt_assert1(link, "Link %s undefined", elm); xbt_assert1(trace, "Trace %s undefined", trace_name); @@ -876,7 +872,7 @@ static void ptask_add_traces(void) xbt_dict_foreach(trace_connect_list_latency, cursor, trace_name, elm) { tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name); link_L07_t link = - xbt_dict_get_or_null(surf_network_model->resource_set, elm); + xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); xbt_assert1(link, "Link %s undefined", elm); xbt_assert1(trace, "Trace %s undefined", trace_name);