From: schnorr Date: Mon, 13 Dec 2010 16:44:22 +0000 (+0000) Subject: [trace] removing obsolete code (host and link declaration is in instr_routing.c) X-Git-Tag: v3.6_beta2~764 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/5423275bf80828ba9e68147dc76a6fcc737826a7?hp=a817d15d9cffa7f528cccb301afb57243be4dd9c [trace] removing obsolete code (host and link declaration is in instr_routing.c) git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9159 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/src/instr/instr_surf.c b/src/instr/instr_surf.c index add2828595..b790425c3d 100644 --- a/src/instr/instr_surf.c +++ b/src/instr/instr_surf.c @@ -11,8 +11,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_surf, instr, "Tracing Surf"); -static xbt_dict_t created_links; -static xbt_dict_t host_containers; static xbt_dict_t resource_variables; /* (host|link)#variable -> value */ /* to trace gtnets */ @@ -21,8 +19,6 @@ static xbt_dict_t gtnets_dst; /* %p (action) -> %s */ void TRACE_surf_alloc(void) { - created_links = xbt_dict_new(); - host_containers = xbt_dict_new(); resource_variables = xbt_dict_new(); gtnets_src = xbt_dict_new(); gtnets_dst = xbt_dict_new(); @@ -32,17 +28,7 @@ void TRACE_surf_alloc(void) void TRACE_surf_release(void) { - char *key, *value; - xbt_dict_cursor_t cursor = NULL; TRACE_surf_resource_utilization_release(); - - /* get all host from host_containers */ - xbt_dict_foreach(host_containers, cursor, key, value) { - pajeDestroyContainer(MSG_get_clock(), "HOST", key); - } - xbt_dict_foreach(created_links, cursor, key, value) { - pajeDestroyContainer(MSG_get_clock(), "LINK", key); - } } static void TRACE_surf_set_resource_variable(double date, @@ -68,55 +54,6 @@ static void TRACE_surf_set_resource_variable(double date, xbt_free); } -/* - * TRACE_surf_link_declaration (name, bandwidth, latency): this function - * saves the bandwidth and latency of a link identified by name. This - * information is used in the future to create the link container in the trace. - * - * caller: net_link_new (from each network model) - * main: create LINK container, set initial bandwidth and latency - * return: void - */ -void TRACE_surf_link_declaration(void *link, char *name, double bw, - double lat) -{ - if (!TRACE_is_active()) - return; - - if (!link){ - xbt_die ("link is NULL"); - } - - //filter out loopback - if (!strcmp(name, "loopback") || !strcmp(name, "__loopback__")) - return; - - char alias[100]; - snprintf(alias, 100, "%p", link); - pajeCreateContainer(SIMIX_get_clock(), alias, "LINK", "platform", name); - xbt_dict_set(created_links, alias, xbt_strdup("1"), xbt_free); - TRACE_surf_link_set_bandwidth(SIMIX_get_clock(), link, bw); - TRACE_surf_link_set_latency(SIMIX_get_clock(), link, lat); -} - -/* - * TRACE_surf_host_declaration (name, power): this function - * saves the power of a host identified by name. This information - * is used to create the host container in the trace. - * - * caller: cpu_new (from each cpu model) + router parser - * main: create HOST containers, set initial power value - * return: void - */ -void TRACE_surf_host_declaration(const char *name, double power) -{ - if (!TRACE_is_active()) - return; - pajeCreateContainer(SIMIX_get_clock(), name, "HOST", "platform", name); - xbt_dict_set(host_containers, name, xbt_strdup("1"), xbt_free); - TRACE_surf_host_set_power(SIMIX_get_clock(), name, power); -} - void TRACE_surf_host_set_power(double date, const char *resource, double power) { @@ -250,17 +187,6 @@ void TRACE_surf_save_onelink(void) } } -int TRACE_surf_link_is_traced(void *link) -{ - char alias[100]; - snprintf(alias, 100, "%p", link); - if (xbt_dict_get_or_null(created_links, alias)) { - return 1; - } else { - return 0; - } -} - void TRACE_surf_action(surf_action_t surf_action, const char *category) { if (!TRACE_is_active()) diff --git a/src/surf/cpu.c b/src/surf/cpu.c index 8e5f51fba7..4a56bfc75e 100644 --- a/src/surf/cpu.c +++ b/src/surf/cpu.c @@ -67,9 +67,6 @@ static cpu_Cas01_t cpu_new(char *name, double power_peak, xbt_dict_set(surf_model_resource_set(surf_cpu_model), name, cpu, surf_resource_free); -#ifdef HAVE_TRACING - TRACE_surf_host_declaration(name, cpu->core * cpu->power_scale * cpu->power_peak); -#endif return cpu; } diff --git a/src/surf/cpu_im.c b/src/surf/cpu_im.c index 1be8704e8f..093b626ae3 100644 --- a/src/surf/cpu_im.c +++ b/src/surf/cpu_im.c @@ -87,10 +87,6 @@ static cpu_Cas01_im_t cpu_im_new(char *name, double power_peak, surf_resource_free); cpu->action_set = xbt_swag_new(xbt_swag_offset(action, cpu_list_hookup)); -#ifdef HAVE_TRACING - TRACE_surf_host_declaration(name, core * power_scale * power_peak); -#endif - return cpu; } diff --git a/src/surf/network.c b/src/surf/network.c index f4327ca079..cfa1139f82 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -188,9 +188,6 @@ static link_CM02_t net_link_new(char *name, xbt_dict_set(surf_network_model->resource_set, name, nw_link, surf_resource_free); -#ifdef HAVE_TRACING - TRACE_surf_link_declaration(nw_link, name, bw_initial, lat_initial); -#endif return nw_link; } diff --git a/src/surf/network_gtnets.c b/src/surf/network_gtnets.c index 42f77ee766..8d6c9508a9 100644 --- a/src/surf/network_gtnets.c +++ b/src/surf/network_gtnets.c @@ -48,10 +48,6 @@ static void link_new(char *name, double bw, double lat, xbt_dict_t props) xbt_dict_set(surf_network_model->resource_set, name, gtnets_link, surf_resource_free); - -#ifdef HAVE_TRACING - TRACE_surf_link_declaration(gtnets_link, name, bw, lat); -#endif } static void route_new(int src_id, int dst_id, xbt_dynar_t links, diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index 387c0ddd8e..6d6bec9f95 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -289,9 +289,6 @@ static void parse_S_router(void) info->rc_type = SURF_NETWORK_ELEMENT_ROUTER; xbt_dict_set(global_routing->where_network_elements, A_surfxml_router_id, (void *) info, xbt_free); -#ifdef HAVE_TRACING - TRACE_surf_host_declaration(A_surfxml_router_id, 0); -#endif if (strcmp(A_surfxml_router_coordinates,"")) { xbt_dynar_t ctn = xbt_str_split_str(A_surfxml_router_coordinates, " "); xbt_dynar_shrink(ctn,0);