From: schnorr Date: Thu, 15 Apr 2010 10:44:02 +0000 (+0000) Subject: renaming the tracing functions that set the host/link utilization X-Git-Tag: SVN~146 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/69b85c9e1af02bcf07222b50ffbe83781b6027b2?hp=e976375d6d6a84fc29baf99e0b0f3e7ec9d10852 renaming the tracing functions that set the host/link utilization git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7595 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/src/instr/private.h b/src/instr/private.h index 238a1fdce8..8c3d72e384 100644 --- a/src/instr/private.h +++ b/src/instr/private.h @@ -106,13 +106,13 @@ void __TRACE_surf_finalize (void); void __TRACE_surf_check_variable_set_to_zero (double now, const char *variable, const char *resource); void __TRACE_surf_update_action_state_resource (double now, double delta, const char *type, const char *name, double value); void __TRACE_surf_set_resource_variable (double date, const char *variable, const char *resource, double value); -void TRACE_surf_update_action_state_net_resource (const char *name, smx_action_t smx_action, double value, double now, double delta); -void TRACE_surf_update_action_state_cpu_resource (const char *name, smx_action_t smx_action, double value, double now, double delta); -void TRACE_surf_link_declaration (char *name, double bw, double lat); void TRACE_surf_host_declaration (char *name, double power); void TRACE_surf_host_set_power (double date, char *resource, double power); +void TRACE_surf_host_set_utilization (const char *name, smx_action_t smx_action, double value, double now, double delta); +void TRACE_surf_link_declaration (char *name, double bw, double lat); void TRACE_surf_link_set_bandwidth (double date, char *resource, double bandwidth); void TRACE_surf_link_set_latency (double date, char *resource, double latency); +void TRACE_surf_link_set_utilization (const char *name, smx_action_t smx_action, double value, double now, double delta); void TRACE_surf_routing_full_parse_end (char *link_name, int src, int dst); void TRACE_surf_missing_link (void); void TRACE_surf_define_host_id (const char *name, int host_id); diff --git a/src/instr/surf_instr.c b/src/instr/surf_instr.c index 104aa54629..966f44e6c0 100644 --- a/src/instr/surf_instr.c +++ b/src/instr/surf_instr.c @@ -234,7 +234,7 @@ void __TRACE_surf_set_resource_variable (double date, const char *variable, cons xbt_dict_set (resource_variables, xbt_strdup(key), xbt_strdup(aux), xbt_free); } -void TRACE_surf_update_action_state_net_resource (const char *name, smx_action_t smx_action, double value, double now, double delta) +void TRACE_surf_link_set_utilization (const char *name, smx_action_t smx_action, double value, double now, double delta) { if (!IS_TRACING || !IS_TRACED(smx_action)) return; @@ -256,7 +256,7 @@ void TRACE_surf_update_action_state_net_resource (const char *name, smx_action_t return; } -void TRACE_surf_update_action_state_cpu_resource (const char *name, smx_action_t smx_action, double value, double now, double delta) +void TRACE_surf_host_set_utilization (const char *name, smx_action_t smx_action, double value, double now, double delta) { if (!IS_TRACING || !IS_TRACED(smx_action)) return; diff --git a/src/surf/cpu.c b/src/surf/cpu.c index 8fe2ef6f63..fb6e449e5e 100644 --- a/src/surf/cpu.c +++ b/src/surf/cpu.c @@ -196,7 +196,7 @@ static void cpu_update_actions_state(double now, double delta) #ifdef HAVE_TRACING cpu_Cas01_t x = lmm_constraint_id(lmm_get_cnst_from_var (cpu_maxmin_system, action->variable, 0)); - TRACE_surf_update_action_state_cpu_resource (x->generic_resource.name, + TRACE_surf_host_set_utilization (x->generic_resource.name, action->generic_action.data, lmm_variable_getvalue(action->variable), now-delta, delta); #endif double_update(&(action->generic_action.remains), diff --git a/src/surf/cpu_im.c b/src/surf/cpu_im.c index 5a65af0a05..6686c4aeef 100644 --- a/src/surf/cpu_im.c +++ b/src/surf/cpu_im.c @@ -226,7 +226,7 @@ static void cpu_im_update_remains(cpu_Cas01_im_t cpu, double now) (action).variable) * (now - cpu->last_update)); #ifdef HAVE_TRACING - TRACE_surf_update_action_state_cpu_resource (cpu->generic_resource.name, + TRACE_surf_host_set_utilization (cpu->generic_resource.name, action->generic_lmm_action.generic_action.data, lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable), cpu->last_update, now-cpu->last_update); #endif DEBUG2("Update action(%p) remains %lf", action, @@ -308,7 +308,7 @@ static void cpu_im_update_actions_state(double now, double delta) GENERIC_ACTION(action).finish = surf_get_clock(); /* set the remains to 0 due to precision problems when updating the remaining amount */ #ifdef HAVE_TRACING - TRACE_surf_update_action_state_cpu_resource (((cpu_Cas01_im_t)(action->cpu))->generic_resource.name, + TRACE_surf_host_set_utilization (((cpu_Cas01_im_t)(action->cpu))->generic_resource.name, action->generic_lmm_action.generic_action.data, lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable), ((cpu_Cas01_im_t)(action->cpu))->last_update, now-((cpu_Cas01_im_t)(action->cpu))->last_update); #endif GENERIC_ACTION(action).remains = 0; diff --git a/src/surf/network.c b/src/surf/network.c index 82d9bae701..8a9c9cef29 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -243,7 +243,7 @@ static void net_update_actions_state(double now, double delta) link_CM02_t link; unsigned int i; xbt_dynar_foreach(route, i, link) { - TRACE_surf_update_action_state_net_resource (link->lmm_resource.generic_resource.name, + TRACE_surf_link_set_utilization (link->lmm_resource.generic_resource.name, action->generic_action.data, lmm_variable_getvalue(action->variable), now-delta, delta); } #endif diff --git a/src/surf/network_gtnets.c b/src/surf/network_gtnets.c index 58244c8e76..756f780044 100644 --- a/src/surf/network_gtnets.c +++ b/src/surf/network_gtnets.c @@ -244,7 +244,7 @@ static void update_actions_state(double now, double delta) unsigned int i; xbt_dynar_foreach(route, i, link) { - TRACE_surf_update_action_state_net_resource (link->generic_resource.name, + TRACE_surf_link_set_utilization (link->generic_resource.name, action->generic_action.data, (action->generic_action.remains-remain)/delta, now-delta, delta); } }