X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Fstats.c;h=7ffc37bd10acaf6727431608a939ae57f64ecedb;hb=44c0619eb20fb7e34b3ec088219fe6d3c05cec75;hp=6e6a61f275ab22c20b9e916ea051792917a43980;hpb=3a686a8b8e3a4808c8c905168a33b461bc740a6b;p=lttv.git

diff --git a/ltt/branches/poly/lttv/lttv/stats.c b/ltt/branches/poly/lttv/lttv/stats.c
index 6e6a61f2..7ffc37bd 100644
--- a/ltt/branches/poly/lttv/lttv/stats.c
+++ b/ltt/branches/poly/lttv/lttv/stats.c
@@ -393,7 +393,6 @@ lttv_tracefile_stats_get_type(void)
   return type;
 }
 
-
 static void
 find_event_tree(LttvTracefileStats *tfcs,
                 GQuark pid_time,
@@ -429,10 +428,9 @@ find_event_tree(LttvTracefileStats *tfcs,
   *event_types_tree = a;
 }
 
-
-/* Update the trace event tree for the specified cpu */
-static void update_trace_event_tree(LttvTracefileStats *tfcs, guint cpu)
+static void update_event_tree(LttvTracefileStats *tfcs)
 {
+  guint cpu = tfcs->parent.cpu;
   LttvTraceState *ts = (LttvTraceState *)tfcs->parent.parent.t_context;
   LttvProcessState *process = ts->running_process[cpu];
   LttvExecutionState *es = process->state;
@@ -444,9 +442,21 @@ static void update_trace_event_tree(LttvTracefileStats *tfcs, guint cpu)
       &(tfcs->current_event_types_tree));
 }
 
-static void update_event_tree(LttvTracefileStats *tfcs)
+
+/* Update the trace event tree for the specified cpu */
+static void update_trace_event_tree(LttvTraceStats *tcs)
 {
-  update_trace_event_tree(tfcs, tfcs->parent.cpu);
+  LttvTracefileStats *tfcs;
+  LttvTraceContext *tc = (LttvTraceContext*)tcs;
+  guint j, nb_tracefile;
+
+  /* For each tracefile, update the event tree */
+  nb_tracefile = tc->tracefiles->len;
+  for(j = 0; j < nb_tracefile; j++) {
+    tfcs = LTTV_TRACEFILE_STATS(g_array_index(tc->tracefiles,
+       LttvTracefileContext*, j));
+    update_event_tree(tfcs);
+  }
 }
 
 static void mode_change(LttvTracefileStats *tfcs)
@@ -485,15 +495,16 @@ static void mode_end(LttvTracefileStats *tfcs)
   LttTime delta;
 
   /* FIXME put there in case of a missing update after a state modification */
+  //void *lasttree = tfcs->current_events_tree;
   //update_event_tree(tfcs);
-
+  //g_assert (lasttree == tfcs->current_events_tree);
   lttv_attribute_find(tfcs->current_events_tree, LTTV_STATS_ELAPSED_TIME, 
       LTTV_TIME, &elapsed_time);
 
-  if(process->state->t != LTTV_STATE_MODE_UNKNOWN)
+  if(process->state->t != LTTV_STATE_MODE_UNKNOWN) {
     delta = ltt_time_sub(tfcs->parent.parent.timestamp, 
         process->state->entry);
-  else
+  } else
     delta = ltt_time_zero;
 
   *(elapsed_time.v_time) = ltt_time_add(*(elapsed_time.v_time), delta);
@@ -552,7 +563,7 @@ static gboolean after_syscall_entry(void *hook_data, void *call_data)
 }
 
 
-gboolean before_syscall_exit(void *hook_data, void *call_data)
+static gboolean before_syscall_exit(void *hook_data, void *call_data)
 {
   mode_end((LttvTracefileStats *)call_data);
   return FALSE;
@@ -566,7 +577,7 @@ static gboolean after_syscall_exit(void *hook_data, void *call_data)
 }
 
 
-gboolean before_trap_entry(void *hook_data, void *call_data)
+static gboolean before_trap_entry(void *hook_data, void *call_data)
 {
   mode_change((LttvTracefileStats *)call_data);
   return FALSE;
@@ -580,99 +591,98 @@ static gboolean after_trap_entry(void *hook_data, void *call_data)
 }
 
 
-gboolean before_trap_exit(void *hook_data, void *call_data)
+static gboolean before_trap_exit(void *hook_data, void *call_data)
 {
   mode_end((LttvTracefileStats *)call_data);
   return FALSE;
 }
 
 
-gboolean after_trap_exit(void *hook_data, void *call_data)
+static gboolean after_trap_exit(void *hook_data, void *call_data)
 {
   after_mode_end((LttvTracefileStats *)call_data);
   return FALSE;
 }
 
 
-gboolean before_irq_entry(void *hook_data, void *call_data)
+static gboolean before_irq_entry(void *hook_data, void *call_data)
 {
   mode_change((LttvTracefileStats *)call_data);
   return FALSE;
 }
 
-gboolean after_irq_entry(void *hook_data, void *call_data)
+static gboolean after_irq_entry(void *hook_data, void *call_data)
 {
   update_event_tree((LttvTracefileStats *)call_data);
   return FALSE;
 }
 
 
-gboolean before_irq_exit(void *hook_data, void *call_data)
+static gboolean before_irq_exit(void *hook_data, void *call_data)
 {
   mode_end((LttvTracefileStats *)call_data);
   return FALSE;
 }
 
 
-gboolean after_irq_exit(void *hook_data, void *call_data)
+static gboolean after_irq_exit(void *hook_data, void *call_data)
 {
   after_mode_end((LttvTracefileStats *)call_data);
   return FALSE;
 }
 
 
-gboolean before_soft_irq_entry(void *hook_data, void *call_data)
+static gboolean before_soft_irq_entry(void *hook_data, void *call_data)
 {
   mode_change((LttvTracefileStats *)call_data);
   return FALSE;
 }
 
-gboolean after_soft_irq_entry(void *hook_data, void *call_data)
+static gboolean after_soft_irq_entry(void *hook_data, void *call_data)
 {
   update_event_tree((LttvTracefileStats *)call_data);
   return FALSE;
 }
 
-
-gboolean before_soft_irq_exit(void *hook_data, void *call_data)
+static gboolean before_soft_irq_exit(void *hook_data, void *call_data)
 {
   mode_end((LttvTracefileStats *)call_data);
   return FALSE;
 }
 
 
-gboolean after_soft_irq_exit(void *hook_data, void *call_data)
+static gboolean after_soft_irq_exit(void *hook_data, void *call_data)
 {
   after_mode_end((LttvTracefileStats *)call_data);
   return FALSE;
 }
 
-gboolean before_function_entry(void *hook_data, void *call_data)
+static gboolean before_function_entry(void *hook_data, void *call_data)
 {
   mode_change((LttvTracefileStats *)call_data);
   return FALSE;
 }
 
-gboolean after_function_entry(void *hook_data, void *call_data)
+static gboolean after_function_entry(void *hook_data, void *call_data)
 {
   update_event_tree((LttvTracefileStats *)call_data);
   return FALSE;
 }
 
-gboolean before_function_exit(void *hook_data, void *call_data)
+static gboolean before_function_exit(void *hook_data, void *call_data)
 {
   mode_end((LttvTracefileStats *)call_data);
   return FALSE;
 }
 
-gboolean after_function_exit(void *hook_data, void *call_data)
+static gboolean after_function_exit(void *hook_data, void *call_data)
 {
   after_mode_end((LttvTracefileStats *)call_data);
   return FALSE;
 }
 
 
-gboolean before_schedchange(void *hook_data, void *call_data)
+static gboolean before_schedchange(void *hook_data, void *call_data)
 {
   LttvTracefileStats *tfcs = (LttvTracefileStats *)call_data;
 
@@ -684,11 +694,11 @@ gboolean before_schedchange(void *hook_data, void *call_data)
 
   guint pid_in, pid_out;
     
-  gint state_out;
+  gint64 state_out;
 
   pid_out = ltt_event_get_unsigned(e, thf->f1);
   pid_in = ltt_event_get_unsigned(e, thf->f2);
-  state_out = ltt_event_get_int(e, thf->f3);
+  state_out = ltt_event_get_long_int(e, thf->f3);
 
   /* compute the time for the process to schedule out */
   mode_change(tfcs);
@@ -696,7 +706,7 @@ gboolean before_schedchange(void *hook_data, void *call_data)
   return FALSE;
 }
 
-gboolean after_schedchange(void *hook_data, void *call_data)
+static gboolean after_schedchange(void *hook_data, void *call_data)
 {
   LttvTracefileStats *tfcs = (LttvTracefileStats *)call_data;
 
@@ -708,13 +718,13 @@ gboolean after_schedchange(void *hook_data, void *call_data)
 
   guint pid_in, pid_out;
     
-  gint state_out;
+  gint64 state_out;
 
   LttvProcessState *process;
 
   pid_out = ltt_event_get_unsigned(e, thf->f1);
   pid_in = ltt_event_get_unsigned(e, thf->f2);
-  state_out = ltt_event_get_int(e, thf->f3);
+  state_out = ltt_event_get_long_int(e, thf->f3);
 
   /* get the information for the process scheduled in */
   guint cpu = tfcs->parent.cpu;
@@ -732,21 +742,18 @@ gboolean after_schedchange(void *hook_data, void *call_data)
   return FALSE;
 }
 
-gboolean process_fork(void *hook_data, void *call_data)
+static gboolean process_fork(void *hook_data, void *call_data)
 {
-  /* nothing to do for now */
   return FALSE;
 }
 
-
-gboolean process_exit(void *hook_data, void *call_data)
+static gboolean process_exit(void *hook_data, void *call_data)
 {
-  /* We should probably exit all modes here or we could do that at 
-     schedule out. */
+  update_event_tree((LttvTracefileStats *)call_data);
   return FALSE;
 }
 
-gboolean before_enum_process_state(void *hook_data, void *call_data)
+static gboolean before_enum_process_state(void *hook_data, void *call_data)
 {
 #if 0
   /* Broken : adds up time in the current process doing the dump */
@@ -758,40 +765,28 @@ gboolean before_enum_process_state(void *hook_data, void *call_data)
   return FALSE;
 }
 
-gboolean after_enum_process_state(void *hook_data, void *call_data)
+static gboolean after_enum_process_state(void *hook_data, void *call_data)
 {
-  LttvTracefileStats *tfcs = (LttvTracefileStats *)call_data;
   LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
-  LttvTraceState *ts = (LttvTraceState*)tfc->t_context;
-  guint nb_cpus, i;
-
-  nb_cpus = ltt_trace_get_num_cpu(ts->parent.t);
-  for(i=0; i<nb_cpus; i++) {
-    update_trace_event_tree(tfcs, i);
-  }
+  LttvTraceStats *tcs = (LttvTraceStats*)tfc->t_context;
+  update_trace_event_tree(tcs);
   return FALSE;
 }
 
 static gboolean after_statedump_end(void *hook_data, void *call_data)
 {
-  LttvTracefileStats *tfcs = (LttvTracefileStats *)call_data;
   LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
-  LttvTraceState *ts = (LttvTraceState*)tfc->t_context;
-  guint nb_cpus, i;
-
-  nb_cpus = ltt_trace_get_num_cpu(ts->parent.t);
-  for(i=0; i<nb_cpus; i++) {
-    update_trace_event_tree(tfcs, i);
-  }
+  LttvTraceStats *tcs = (LttvTraceStats*)tfc->t_context;
+  update_trace_event_tree(tcs);
   return FALSE;
 }
 
-gboolean process_free(void *hook_data, void *call_data)
+static gboolean process_free(void *hook_data, void *call_data)
 {
   return FALSE;
 }
 
-gboolean every_event(void *hook_data, void *call_data)
+static gboolean every_event(void *hook_data, void *call_data)
 {
   LttvTracefileStats *tfcs = (LttvTracefileStats *)call_data;
 
@@ -811,22 +806,35 @@ gboolean every_event(void *hook_data, void *call_data)
   return FALSE;
 }
 
-static void lttv_stats_cleanup_process_state(LttvTraceState *ts,
-  LttvProcessState *process)
+struct cleanup_state_struct {
+  LttvTraceState *ts;
+  LttTime current_time;
+};
+
+//static void lttv_stats_cleanup_process_state(LttvTraceState *ts,
+//  LttvProcessState *process, LttTime current_time)
+static void lttv_stats_cleanup_process_state(gpointer key, gpointer value,
+  gpointer user_data)
 {
+  struct cleanup_state_struct *cleanup_closure =
+    (struct cleanup_state_struct *)user_data;
+  LttvTraceState *ts = cleanup_closure->ts;
   LttvTraceStats *tcs = (LttvTraceStats *)ts;
+  LttvProcessState *process = (LttvProcessState *)value;
   LttvTracesetContext *tsc = ts->parent.ts_context;
+  LttTime current_time = cleanup_closure->current_time;
   int i;
   LttvTracefileStats **tfs = (LttvTracefileStats **)
       &g_array_index(ts->parent.tracefiles, LttvTracefileContext*,
           process->cpu);
   int cleanup_empty = 0;
   LttTime nested_delta = ltt_time_zero;
+
   /* FIXME : ok, this is a hack. The time is infinite here :( */
-  LttTime save_time = (*tfs)->parent.parent.timestamp;
-  LttTime start, end;
-  ltt_trace_time_span_get(ts->parent.t, &start, &end);
-  (*tfs)->parent.parent.timestamp = end;
+  //LttTime save_time = (*tfs)->parent.parent.timestamp;
+  //LttTime start, end;
+  //ltt_trace_time_span_get(ts->parent.t, &start, &end);
+  //(*tfs)->parent.parent.timestamp = end;
 
   do {
     if(ltt_time_compare(process->state->cum_cpu_time, ltt_time_zero) != 0) {
@@ -835,7 +843,9 @@ static void lttv_stats_cleanup_process_state(LttvTraceState *ts,
           process->current_function,
           process->state->t, process->state->n, &((*tfs)->current_events_tree), 
           &((*tfs)->current_event_types_tree));
-      mode_end(*tfs);
+      /* Call mode_end only if not at end of trace */
+      if(ltt_time_compare(current_time, ltt_time_infinite) != 0)
+        mode_end(*tfs);
       nested_delta = process->state->cum_cpu_time;
     }
     cleanup_empty = lttv_state_pop_state_cleanup(process,
@@ -845,25 +855,33 @@ static void lttv_stats_cleanup_process_state(LttvTraceState *ts,
 
   } while(cleanup_empty != 1);
 
-  (*tfs)->parent.parent.timestamp = save_time;
+  //(*tfs)->parent.parent.timestamp = save_time;
 }
 
 /* For each cpu, for each of their stacked states,
  * perform sum of needed values. */
-static void lttv_stats_cleanup_state(LttvTraceStats *tcs)
+static void lttv_stats_cleanup_state(LttvTraceStats *tcs, LttTime current_time)
 {
   LttvTraceState *ts = (LttvTraceState *)tcs;
+  struct cleanup_state_struct cleanup_closure;
+#if 0
   guint nb_cpus, i;
 
   nb_cpus = ltt_trace_get_num_cpu(ts->parent.t);
   
   for(i=0; i<nb_cpus; i++) {
-    lttv_stats_cleanup_process_state(ts, ts->running_process[i]);
+    lttv_stats_cleanup_process_state(ts, ts->running_process[i], current_time);
   }
+#endif //0
+  cleanup_closure.ts = tcs;
+  cleanup_closure.current_time = current_time;
+  g_hash_table_foreach(ts->processes, lttv_stats_cleanup_process_state,
+    &cleanup_closure);
 }
 
 void
-lttv_stats_sum_trace(LttvTraceStats *self, LttvAttribute *ts_stats)
+lttv_stats_sum_trace(LttvTraceStats *self, LttvAttribute *ts_stats,
+  LttTime current_time)
 {
   LttvAttribute *sum_container = self->stats;
 
@@ -902,7 +920,7 @@ lttv_stats_sum_trace(LttvTraceStats *self, LttvAttribute *ts_stats)
   /* First cleanup the state : sum all stalled information (never ending
    * states). */
   if(!trace_is_summed)
-    lttv_stats_cleanup_state(self);
+    lttv_stats_cleanup_state(self, current_time);
   
   processes_tree = lttv_attribute_find_subdir(main_tree, 
                                               LTTV_STATS_PROCESSES);
@@ -992,12 +1010,14 @@ lttv_stats_sum_trace(LttvTraceStats *self, LttvAttribute *ts_stats)
 
 gboolean lttv_stats_sum_traceset_hook(void *hook_data, void *call_data)
 {
-  lttv_stats_sum_traceset((LttvTracesetStats *)call_data);
+  struct sum_traceset_closure *closure =
+    (struct sum_traceset_closure *)call_data;
+  lttv_stats_sum_traceset(closure->tss, closure->current_time);
   return 0;
 }
 
 void
-lttv_stats_sum_traceset(LttvTracesetStats *self)
+lttv_stats_sum_traceset(LttvTracesetStats *self, LttTime current_time)
 {
   LttvTraceset *traceset = self->parent.parent.ts;
   LttvAttribute *sum_container = self->stats;
@@ -1019,7 +1039,7 @@ lttv_stats_sum_traceset(LttvTracesetStats *self)
 
   for(i = 0 ; i < nb_trace ; i++) {
     tcs = (LttvTraceStats *)(self->parent.parent.traces[i]);
-    lttv_stats_sum_trace(tcs, self->stats);
+    lttv_stats_sum_trace(tcs, self->stats, current_time);
   //        lttv_attribute_recursive_add(sum_container, tcs->stats);
   }
 }
@@ -1082,14 +1102,14 @@ void lttv_stats_add_event_hooks(LttvTracesetStats *self)
     if(ret) hn--;
 
     ret = lttv_trace_find_hook(ts->parent.parent.t,
-        LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_ENTRY,
+        LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_TRAP_ENTRY,
         LTT_FIELD_TRAP_ID, 0, 0,
         before_trap_entry, NULL, 
         &g_array_index(hooks, LttvTraceHook, hn++));
     if(ret) hn--;
 
     ret = lttv_trace_find_hook(ts->parent.parent.t,
-        LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_EXIT,
+        LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_TRAP_EXIT,
         0, 0, 0,
         before_trap_exit, NULL,
         &g_array_index(hooks, LttvTraceHook, hn++));
@@ -1124,8 +1144,8 @@ void lttv_stats_add_event_hooks(LttvTracesetStats *self)
     if(ret) hn--;
 
     ret = lttv_trace_find_hook(ts->parent.parent.t,
-        LTT_FACILITY_PROCESS, LTT_EVENT_SCHEDCHANGE,
-        LTT_FIELD_OUT, LTT_FIELD_IN, LTT_FIELD_OUT_STATE,
+        LTT_FACILITY_KERNEL, LTT_EVENT_SCHED_SCHEDULE,
+        LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE,
         before_schedchange, NULL, 
         &g_array_index(hooks, LttvTraceHook, hn++));
     if(ret) hn--;
@@ -1146,7 +1166,7 @@ void lttv_stats_add_event_hooks(LttvTracesetStats *self)
 
     /* statedump-related hooks */
     ret = lttv_trace_find_hook(ts->parent.parent.t,
-        LTT_FACILITY_STATEDUMP, LTT_EVENT_ENUM_PROCESS_STATE,
+        LTT_FACILITY_LIST, LTT_EVENT_PROCESS_STATE,
         LTT_FIELD_PID, LTT_FIELD_PARENT_PID, LTT_FIELD_NAME,
         before_enum_process_state, NULL,
         &g_array_index(hooks, LttvTraceHook, hn++));
@@ -1175,14 +1195,14 @@ void lttv_stats_add_event_hooks(LttvTracesetStats *self)
     if(ret) hn--;
 
     ret = lttv_trace_find_hook(ts->parent.parent.t,
-        LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_ENTRY, 
+        LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_TRAP_ENTRY, 
         LTT_FIELD_TRAP_ID, 0, 0,
         after_trap_entry, NULL,
         &g_array_index(hooks, LttvTraceHook, hn++));
     if(ret) hn--;
 
     ret = lttv_trace_find_hook(ts->parent.parent.t,
-        LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_EXIT,
+        LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_TRAP_EXIT,
         0, 0, 0,
         after_trap_exit, NULL,
         &g_array_index(hooks, LttvTraceHook, hn++));
@@ -1217,28 +1237,28 @@ void lttv_stats_add_event_hooks(LttvTracesetStats *self)
     if(ret) hn--;
 
     ret = lttv_trace_find_hook(ts->parent.parent.t,
-        LTT_FACILITY_PROCESS, LTT_EVENT_SCHEDCHANGE,
-        LTT_FIELD_OUT, LTT_FIELD_IN, LTT_FIELD_OUT_STATE,
+        LTT_FACILITY_KERNEL, LTT_EVENT_SCHED_SCHEDULE,
+        LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE,
         after_schedchange, NULL, 
         &g_array_index(hooks, LttvTraceHook, hn++));
     if(ret) hn--;
 
     ret = lttv_trace_find_hook(ts->parent.parent.t,
-        LTT_FACILITY_PROCESS, LTT_EVENT_FORK, 
+        LTT_FACILITY_KERNEL, LTT_EVENT_PROCESS_FORK, 
         LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID, 0,
         process_fork, NULL, 
         &g_array_index(hooks, LttvTraceHook, hn++));
     if(ret) hn--;
 
     ret = lttv_trace_find_hook(ts->parent.parent.t,
-        LTT_FACILITY_PROCESS, LTT_EVENT_EXIT,
+        LTT_FACILITY_KERNEL, LTT_EVENT_PROCESS_EXIT,
         LTT_FIELD_PID, 0, 0,
         process_exit, NULL,
         &g_array_index(hooks, LttvTraceHook, hn++));
     if(ret) hn--;
     
     ret = lttv_trace_find_hook(ts->parent.parent.t,
-        LTT_FACILITY_PROCESS, LTT_EVENT_FREE,
+        LTT_FACILITY_KERNEL, LTT_EVENT_PROCESS_FREE,
         LTT_FIELD_PID, 0, 0,
         process_free, NULL,
         &g_array_index(hooks, LttvTraceHook, hn++));
@@ -1260,14 +1280,14 @@ void lttv_stats_add_event_hooks(LttvTracesetStats *self)
 
     /* statedump-related hooks */
     ret = lttv_trace_find_hook(ts->parent.parent.t,
-        LTT_FACILITY_STATEDUMP, LTT_EVENT_ENUM_PROCESS_STATE,
+        LTT_FACILITY_LIST, LTT_EVENT_PROCESS_STATE,
         LTT_FIELD_PID, LTT_FIELD_PARENT_PID, LTT_FIELD_NAME,
         after_enum_process_state, NULL,
         &g_array_index(hooks, LttvTraceHook, hn++));
     if(ret) hn--;
 
     ret = lttv_trace_find_hook(ts->parent.parent.t,
-        LTT_FACILITY_STATEDUMP, LTT_EVENT_STATEDUMP_END,
+        LTT_FACILITY_LIST, LTT_EVENT_STATEDUMP_END,
         0, 0, 0,
         after_statedump_end, NULL,
         &g_array_index(hooks, LttvTraceHook, hn++));