removing code that was used to trace every single surf action

details:
- it was capable to generate huge trace files
- so we disable this type of trace

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7594 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/instr/private.h b/src/instr/private.h
index a364c59..238a1fd 100644 (file)
--- a/src/instr/private.h
+++ b/src/instr/private.h
@@ -106,7 +106,6 @@ 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 (void *surf_action, smx_action_t smx_action, double value, const char *stateValue, double now, double delta);
 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);

diff --git a/src/instr/surf_instr.c b/src/instr/surf_instr.c
index f1afcef..104aa54 100644 (file)
--- a/src/instr/surf_instr.c
+++ b/src/instr/surf_instr.c
@@ -234,11 +234,6 @@ 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 (void *surf_action, smx_action_t smx_action,
-    double value, const char *stateValue, double now, double delta)
-{
-}
-
 void TRACE_surf_update_action_state_net_resource (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 443493d..8fe2ef6 100644 (file)
--- a/src/surf/cpu.c
+++ b/src/surf/cpu.c
@@ -194,8 +194,6 @@ static void cpu_update_actions_state(double now, double delta)
 
   xbt_swag_foreach_safe(action, next_action, running_actions) {
 #ifdef HAVE_TRACING
-    TRACE_surf_update_action_state (action, action->generic_action.data,
-        lmm_variable_getvalue(action->variable), "PowerUsed", now-delta, delta);
     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,

diff --git a/src/surf/cpu_im.c b/src/surf/cpu_im.c
index 5c4c58a..5a65af0 100644 (file)
--- a/src/surf/cpu_im.c
+++ b/src/surf/cpu_im.c
@@ -226,8 +226,6 @@ 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 (action, action->generic_lmm_action.generic_action.data,
-          lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable), "PowerUsed", cpu->last_update, now-cpu->last_update);
       TRACE_surf_update_action_state_cpu_resource (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
@@ -310,8 +308,6 @@ 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 (action, action->generic_lmm_action.generic_action.data,
-        lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable), "PowerUsed", ((cpu_Cas01_im_t)(action->cpu))->last_update, now - ((cpu_Cas01_im_t)(action->cpu))->last_update);
     TRACE_surf_update_action_state_cpu_resource (((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

diff --git a/src/surf/network.c b/src/surf/network.c
index e867afd..82d9bae 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -239,9 +239,6 @@ static void net_update_actions_state(double now, double delta)
   xbt_swag_foreach_safe(action, next_action, running_actions) {
 
 #ifdef HAVE_TRACING
-    TRACE_surf_update_action_state (action, action->generic_action.data,
-        lmm_variable_getvalue(action->variable), "BandwidthUsed", now-delta, delta);
-
     xbt_dynar_t route = used_routing->get_route(action->src, action->dst);
     link_CM02_t link;
     unsigned int i;

diff --git a/src/surf/network_gtnets.c b/src/surf/network_gtnets.c
index b0f62c3..58244c8 100644 (file)
--- a/src/surf/network_gtnets.c
+++ b/src/surf/network_gtnets.c
@@ -235,10 +235,6 @@ static void update_actions_state(double now, double delta)
       double remain = gtnets_get_flow_rx(action);
 
 #ifdef HAVE_TRACING
-      // tracing surf action
-      TRACE_surf_update_action_state (action, action->generic_action.data,
-                 (action->generic_action.remains-remain)/delta, "BandwidthUsed", now-delta, delta);
-
       // tracing resource utilization
       int src = TRACE_surf_gtnets_get_src (action);
       int dst = TRACE_surf_gtnets_get_dst (action);