From: compudj <compudj@04897980-b3bd-0310-b5e0-8ef037075253>
Date: Thu, 17 Jul 2008 21:31:38 +0000 (+0000)
Subject: revert test work, keep hotplug fix
X-Git-Tag: v0.12.20~524
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=817fed61778e0f108694f789faa7a8a0966832f5;p=lttv.git

revert test work, keep hotplug fix

git-svn-id: http://ltt.polymtl.ca/svn@2965 04897980-b3bd-0310-b5e0-8ef037075253
---

diff --git a/ltt/branches/poly/lttv/lttv/state.c b/ltt/branches/poly/lttv/lttv/state.c
index c2e65a44..6fb3b2af 100644
--- a/ltt/branches/poly/lttv/lttv/state.c
+++ b/ltt/branches/poly/lttv/lttv/state.c
@@ -33,8 +33,6 @@
 #include <string.h>
 #include <ltt/ltt-private.h>
 
-guint64 nr_states = 0;
-
 /* Comment :
  * Mathieu Desnoyers
  * usertrace is there only to be able to update the current CPU of the
@@ -2361,8 +2359,6 @@ static int exit_process(LttvTracefileState *tfs, LttvProcessState *process)
   LttvTraceState *ts = LTTV_TRACE_STATE(tfs->parent.t_context);
   LttvProcessState key;
 
-  nr_states++;
-
   /* Wait for both schedule with exit dead and process free to happen.
    * They can happen in any order. */
   if (++(process->free_events) < 2)
@@ -2404,8 +2400,6 @@ static gboolean syscall_entry(void *hook_data, void *call_data)
   struct marker_field *f = lttv_trace_get_hook_field(th, 0);
   LttvExecutionSubmode submode;
 
-  nr_states++;
-
   guint syscall = ltt_event_get_unsigned(e, f);
   expand_syscall_table(ts, syscall);
   submode = ((LttvTraceState *)(s->parent.t_context))->syscall_names[syscall];
@@ -2440,7 +2434,6 @@ static gboolean trap_entry(void *hook_data, void *call_data)
 
   LttvExecutionSubmode submode;
 
-  nr_states++;
   guint64 trap = ltt_event_get_long_unsigned(e, f);
 
   expand_trap_table(ts, trap);
@@ -2486,7 +2479,6 @@ static gboolean irq_entry(void *hook_data, void *call_data)
   LttvTraceHook *th = (LttvTraceHook *)hook_data;
   struct marker_field *f = lttv_trace_get_hook_field(th, 0);
 
-  nr_states++;
   LttvExecutionSubmode submode;
   guint64 irq = ltt_event_get_long_unsigned(e, f);
 
@@ -2584,7 +2576,6 @@ static gboolean soft_irq_entry(void *hook_data, void *call_data)
   expand_soft_irq_table(ts, softirq);
   submode = ((LttvTraceState *)(s->parent.t_context))->soft_irq_names[softirq];
 
-  nr_states++;
   /* Do something with the info about being in user or system mode when int? */
   push_state(s, LTTV_STATE_SOFT_IRQ, submode);
 
@@ -2635,7 +2626,6 @@ static gboolean bdev_request_issue(void *hook_data, void *call_data)
     lttv_trace_get_hook_field(th, 2));
   guint16 devcode = MKDEV(major,minor);
 
-  nr_states++;
   /* have we seen this block device before? */
   gpointer bdev = get_hashed_bdevstate(ts, devcode);
 
@@ -2806,7 +2796,6 @@ static gboolean schedchange(void *hook_data, void *call_data)
   pid_in = ltt_event_get_unsigned(e, lttv_trace_get_hook_field(th, 1));
   state_out = ltt_event_get_long_int(e, lttv_trace_get_hook_field(th, 2));
   
-  nr_states++;
   if(likely(process != NULL)) {
 
     /* We could not know but it was not the idle process executing.
@@ -2896,7 +2885,6 @@ static gboolean process_fork(void *hook_data, void *call_data)
   LttvProcessState *child_process;
   struct marker_field *f;
 
-  nr_states++;
   /* Parent PID */
   parent_pid = ltt_event_get_unsigned(e, lttv_trace_get_hook_field(th, 0));
 
@@ -3072,7 +3060,6 @@ static gboolean process_exec(void *hook_data, void *call_data)
   guint cpu = s->cpu;
   LttvProcessState *process = ts->running_process[cpu];
 
-  nr_states++;
 #if 0//how to use a sequence that must be transformed in a string
   /* PID of the process to release */
   guint64 name_len = ltt_event_field_element_number(e,
diff --git a/ltt/branches/poly/lttv/lttv/state.h b/ltt/branches/poly/lttv/lttv/state.h
index 0092f796..523e058b 100644
--- a/ltt/branches/poly/lttv/lttv/state.h
+++ b/ltt/branches/poly/lttv/lttv/state.h
@@ -53,7 +53,6 @@
 
 #define LTTV_STATE_SAVE_INTERVAL 50000
 
-extern guint64 nr_states;
 /* Facilities Quarks */
 
 extern GQuark
diff --git a/ltt/branches/poly/lttv/modules/text/textDump.c b/ltt/branches/poly/lttv/modules/text/textDump.c
index a5a09d5e..4fcd5b5c 100644
--- a/ltt/branches/poly/lttv/modules/text/textDump.c
+++ b/ltt/branches/poly/lttv/modules/text/textDump.c
@@ -274,7 +274,6 @@ static gboolean write_traceset_footer(void *hook_data, void *call_data)
   g_info("TextDump traceset footer");
 
   fprintf(a_file,"End trace set\n\n");
-  fprintf(a_file,"nr states created (total) : %llu\n\n", nr_states);
 
   if(LTTV_IS_TRACESET_STATS(tc)) {
     lttv_stats_sum_traceset((LttvTracesetStats *)tc, ltt_time_infinite);