continue implementation of resourceview
[lttv.git] / ltt / branches / poly / lttv / lttv / state.c
index c9b2b5ca1b7aac658413e28edd38c8574dd38133..ff388014da07c0e7a28bfd7399f5b24702d0b279 100644 (file)
@@ -47,9 +47,8 @@
 GQuark
     LTT_FACILITY_KERNEL,
     LTT_FACILITY_KERNEL_ARCH,
-    LTT_FACILITY_PROCESS,
+    LTT_FACILITY_LIST,
     LTT_FACILITY_FS,
-    LTT_FACILITY_STATEDUMP,
     LTT_FACILITY_USER_GENERIC;
 
 /* Events Quarks */
@@ -63,13 +62,13 @@ GQuark
     LTT_EVENT_IRQ_EXIT,
     LTT_EVENT_SOFT_IRQ_ENTRY,
     LTT_EVENT_SOFT_IRQ_EXIT,
-    LTT_EVENT_SCHEDCHANGE,
-    LTT_EVENT_FORK,
-    LTT_EVENT_KERNEL_THREAD,
-    LTT_EVENT_EXIT,
-    LTT_EVENT_FREE,
+    LTT_EVENT_SCHED_SCHEDULE,
+    LTT_EVENT_PROCESS_FORK,
+    LTT_EVENT_KTHREAD_CREATE,
+    LTT_EVENT_PROCESS_EXIT,
+    LTT_EVENT_PROCESS_FREE,
     LTT_EVENT_EXEC,
-    LTT_EVENT_ENUM_PROCESS_STATE,
+    LTT_EVENT_PROCESS_STATE,
     LTT_EVENT_STATEDUMP_END,
     LTT_EVENT_FUNCTION_ENTRY,
     LTT_EVENT_FUNCTION_EXIT,
@@ -82,13 +81,14 @@ GQuark
     LTT_FIELD_TRAP_ID,
     LTT_FIELD_IRQ_ID,
     LTT_FIELD_SOFT_IRQ_ID,
-    LTT_FIELD_OUT,
-    LTT_FIELD_IN,
-    LTT_FIELD_OUT_STATE,
+    LTT_FIELD_PREV_PID,
+    LTT_FIELD_NEXT_PID,
+    LTT_FIELD_PREV_STATE,
     LTT_FIELD_PARENT_PID,
     LTT_FIELD_CHILD_PID,
     LTT_FIELD_PID,
     LTT_FIELD_TGID,
+    LTT_FIELD_CHILD_TGID,
     LTT_FIELD_FILENAME,
     LTT_FIELD_NAME,
     LTT_FIELD_TYPE,
@@ -112,7 +112,6 @@ LttvExecutionSubmode
 
 LttvProcessStatus
   LTTV_STATE_UNNAMED,
-  LTTV_STATE_UNBRANDED,
   LTTV_STATE_WAIT_FORK,
   LTTV_STATE_WAIT_CPU,
   LTTV_STATE_EXIT,
@@ -121,10 +120,18 @@ LttvProcessStatus
   LTTV_STATE_RUN,
   LTTV_STATE_DEAD;
 
+GQuark
+  LTTV_STATE_UNBRANDED;
+
 LttvProcessType
   LTTV_STATE_USER_THREAD,
   LTTV_STATE_KERNEL_THREAD;
 
+LttvCPUMode
+  LTTV_CPU_UNKNOWN,
+  LTTV_CPU_IDLE,
+  LTTV_CPU_BUSY;
+
 static GQuark
   LTTV_STATE_TRACEFILES,
   LTTV_STATE_PROCESSES,
@@ -255,8 +262,9 @@ restore_init_state(LttvTraceState *self)
       &g_array_index(self->running_process[i]->execution_stack,
         LttvExecutionState, 0);
     es->t = LTTV_STATE_MODE_UNKNOWN;
+    es->s = LTTV_STATE_UNNAMED;
 
-    self->running_process[i]->state->s = LTTV_STATE_RUN;
+    //self->running_process[i]->state->s = LTTV_STATE_RUN;
     self->running_process[i]->cpu = i;
   }
   
@@ -407,6 +415,8 @@ init(LttvTracesetState *self, LttvTraceset *ts)
     tcs->usertraces = NULL;
     tcs->running_process = g_new(LttvProcessState*, 
                                  ltt_trace_get_num_cpu(tc->t));
+    tcs->cpu_states = g_new(LttvCPUState, 
+                                 ltt_trace_get_num_cpu(tc->t));
     restore_init_state(tcs);
     for(j = 0 ; j < nb_tracefile ; j++) {
       tfcs = 
@@ -414,6 +424,7 @@ init(LttvTracesetState *self, LttvTraceset *ts)
                                           LttvTracefileContext*, j));
       tfcs->tracefile_name = ltt_tracefile_name(tfcs->parent.tf);
       tfcs->cpu = ltt_tracefile_cpu(tfcs->parent.tf);
+      tfcs->cpu_state = &(tcs->cpu_states[tfcs->cpu]);
       if(ltt_tracefile_tid(tfcs->parent.tf) != 0) {
         /* It's a Usertrace */
         guint tid = ltt_tracefile_tid(tfcs->parent.tf);
@@ -1433,7 +1444,7 @@ create_name_tables(LttvTraceState *tcs)
     name_tables->nb_syscalls = 0;
   }
 
-  if(!lttv_trace_find_hook(tcs->parent.t, LTT_FACILITY_KERNEL,
+  if(!lttv_trace_find_hook(tcs->parent.t, LTT_FACILITY_KERNEL_ARCH,
         LTT_EVENT_TRAP_ENTRY,
         LTT_FIELD_TRAP_ID, 0, 0,
         NULL, NULL, &h)) {
@@ -1821,6 +1832,7 @@ lttv_state_find_process_or_create(LttvTraceState *ts, guint cpu, guint pid,
     process->state = es =
       &g_array_index(process->execution_stack, LttvExecutionState, 0);
     es->t = LTTV_STATE_MODE_UNKNOWN;
+    es->s = LTTV_STATE_UNNAMED;
   }
   return process;
 }
@@ -2120,11 +2132,11 @@ static gboolean schedchange(void *hook_data, void *call_data)
   LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
   LttvTraceHookByFacility *thf = (LttvTraceHookByFacility *)hook_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);
   
   if(likely(process != NULL)) {
 
@@ -2140,24 +2152,31 @@ static gboolean schedchange(void *hook_data, void *call_data)
     //if(unlikely(process->pid != pid_out)) {
     //  g_assert(process->pid == 0);
     //}
-    if(process->pid == 0 && process->state->t == LTTV_STATE_MODE_UNKNOWN) {
-      /* Scheduling out of pid 0 at beginning of the trace :
-       * we know for sure it is in syscall mode at this point. */
-      g_assert(process->execution_stack->len == 1);
-      process->state->t = LTTV_STATE_SYSCALL;
-    }
-    if(unlikely(process->state->s == LTTV_STATE_EXIT)) {
-      process->state->s = LTTV_STATE_ZOMBIE;
-      process->state->change = s->parent.timestamp;
+    if(process->pid == 0
+      && process->state->t == LTTV_STATE_MODE_UNKNOWN) {
+      if(pid_out == 0) {
+        /* Scheduling out of pid 0 at beginning of the trace :
+         * we know for sure it is in syscall mode at this point. */
+        g_assert(process->execution_stack->len == 1);
+        process->state->t = LTTV_STATE_SYSCALL;
+        process->state->s = LTTV_STATE_WAIT;
+        process->state->change = s->parent.timestamp;
+        process->state->entry = s->parent.timestamp;
+      }
     } else {
-      if(unlikely(state_out == 0)) process->state->s = LTTV_STATE_WAIT_CPU;
-      else process->state->s = LTTV_STATE_WAIT;
-      process->state->change = s->parent.timestamp;
+      if(unlikely(process->state->s == LTTV_STATE_EXIT)) {
+        process->state->s = LTTV_STATE_ZOMBIE;
+        process->state->change = s->parent.timestamp;
+      } else {
+        if(unlikely(state_out == 0)) process->state->s = LTTV_STATE_WAIT_CPU;
+        else process->state->s = LTTV_STATE_WAIT;
+        process->state->change = s->parent.timestamp;
+      }
+      
+      if(state_out == 32 || state_out == 128)
+         exit_process(s, process); /* EXIT_DEAD || TASK_DEAD */
+            /* see sched.h for states */
     }
-    
-    if(state_out == 32)
-       exit_process(s, process); /* EXIT_DEAD */
-          /* see sched.h for states */
   }
   process = ts->running_process[cpu] =
               lttv_state_find_process_or_create(
@@ -2170,6 +2189,13 @@ static gboolean schedchange(void *hook_data, void *call_data)
     process->usertrace->cpu = cpu;
  // process->last_cpu_index = ltt_tracefile_num(((LttvTracefileContext*)s)->tf);
   process->state->change = s->parent.timestamp;
+
+  /* update cpu status */
+  if(pid_in == 0)
+    s->cpu_state->present_state = LTTV_CPU_IDLE;
+  else
+    s->cpu_state->present_state = LTTV_CPU_BUSY;
+
   return FALSE;
 }
 
@@ -2246,7 +2272,8 @@ static gboolean process_fork(void *hook_data, void *call_data)
   return FALSE;
 }
 
-/* We stamp a newly created process as kernel_thread */
+/* We stamp a newly created process as kernel_thread.
+ * The thread should not be running yet. */
 static gboolean process_kernel_thread(void *hook_data, void *call_data)
 {
   LttvTracefileState *s = (LttvTracefileState *)call_data;
@@ -2259,11 +2286,15 @@ static gboolean process_kernel_thread(void *hook_data, void *call_data)
   LttvExecutionState *es;
 
   /* PID */
-  pid = ltt_event_get_unsigned(e, thf->f1);
+  pid = (guint)ltt_event_get_long_unsigned(e, thf->f1);
   s->parent.target_pid = pid;
 
-  process = lttv_state_find_process(ts, ANY_CPU, pid);
-  es = &g_array_index(process->execution_stack, LttvExecutionState, 0);
+  process = lttv_state_find_process_or_create(ts, ANY_CPU, pid,
+               &ltt_time_zero);
+  process->execution_stack = 
+    g_array_set_size(process->execution_stack, 1);
+  es = process->state =
+    &g_array_index(process->execution_stack, LttvExecutionState, 0);
   es->t = LTTV_STATE_SYSCALL;
   process->type = LTTV_STATE_KERNEL_THREAD;
 
@@ -2351,6 +2382,7 @@ static gboolean process_exec(void *hook_data, void *call_data)
   guint cpu = s->cpu;
   LttvProcessState *process = ts->running_process[cpu];
 
+#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, thf->f1);
   //name = ltt_event_get_string(e, thf->f1);
@@ -2360,10 +2392,12 @@ static gboolean process_exec(void *hook_data, void *call_data)
   gchar *null_term_name = g_new(gchar, name_len+1);
   memcpy(null_term_name, name_begin, name_len);
   null_term_name[name_len] = '\0';
-
   process->name = g_quark_from_string(null_term_name);
+#endif //0
+
+  process->name = g_quark_from_string(ltt_event_get_string(e, thf->f1));
   process->brand = LTTV_STATE_UNBRANDED;
-  g_free(null_term_name);
+  //g_free(null_term_name);
   return FALSE;
 }
 
@@ -2396,11 +2430,12 @@ static void fix_process(gpointer key, gpointer value,
     es = &g_array_index(process->execution_stack, LttvExecutionState, 0);
     if(es->t == LTTV_STATE_MODE_UNKNOWN) {
       es->t = LTTV_STATE_SYSCALL;
-      es->s = LTTV_STATE_WAIT;
       es->n = LTTV_STATE_SUBMODE_NONE;
       es->entry = *timestamp;
       es->change = *timestamp;
       es->cum_cpu_time = ltt_time_zero;
+      if(es->s == LTTV_STATE_UNNAMED)
+        es->s = LTTV_STATE_WAIT;
     }
   } else {
     es = &g_array_index(process->execution_stack, LttvExecutionState, 0);
@@ -2411,10 +2446,13 @@ static void fix_process(gpointer key, gpointer value,
       //g_assert(timestamp->tv_sec != 0);
       es->change = *timestamp;
       es->cum_cpu_time = ltt_time_zero;
-      es->s = LTTV_STATE_RUN;
+      if(es->s == LTTV_STATE_UNNAMED)
+        es->s = LTTV_STATE_RUN;
 
       if(process->execution_stack->len == 1) {
-        /* Still in user mode, means never scheduled */
+        /* Still in bottom unknown mode, means never did a system call
+        * May be either in user mode, syscall mode, running or waiting.*/
+       /* FIXME : we may be tagging syscall mode when being user mode */
         process->execution_stack =
           g_array_set_size(process->execution_stack, 2);
         es = process->state = &g_array_index(process->execution_stack, 
@@ -2425,7 +2463,8 @@ static void fix_process(gpointer key, gpointer value,
         //g_assert(timestamp->tv_sec != 0);
         es->change = *timestamp;
         es->cum_cpu_time = ltt_time_zero;
-        es->s = LTTV_STATE_WAIT;
+       if(es->s == LTTV_STATE_WAIT_FORK)
+          es->s = LTTV_STATE_WAIT;
       }
     }
   }
@@ -2465,6 +2504,7 @@ static gboolean enum_process_state(void *hook_data, void *call_data)
   LttField *f4, *f5, *f6, *f7, *f8;
   GQuark type, mode, submode, status;
   LttvExecutionState *es;
+  guint i, nb_cpus;
 
   /* PID */
   pid = ltt_event_get_unsigned(e, thf->f1);
@@ -2501,88 +2541,111 @@ static gboolean enum_process_state(void *hook_data, void *call_data)
   if(f8) tgid = ltt_event_get_unsigned(e, f8);
   else tgid = 0;
 
-  /* The process might exist if a process was forked while performing the state 
-   * dump. */
-  process = lttv_state_find_process(ts, ANY_CPU, pid);
-  if(process == NULL) {
-    parent_process = lttv_state_find_process(ts, ANY_CPU, parent_pid);
-    process = lttv_state_create_process(ts, parent_process, cpu,
-                              pid, tgid, g_quark_from_string(command),
-                              &s->parent.timestamp);
-  
-    /* Keep the stack bottom : a running user mode */
-    /* Disabled because of inconsistencies in the current statedump states. */
-    if(type == LTTV_STATE_KERNEL_THREAD) {
-      /* Only keep the bottom 
-       * FIXME Kernel thread : can be in syscall or interrupt or trap. */
-      /* Will cause expected trap when in fact being syscall (even after end of
-       * statedump event)
-       * Will cause expected interrupt when being syscall. (only before end of
-       * statedump event) */
-      // This will cause a "popping last state on stack, ignoring it."
-      process->execution_stack = g_array_set_size(process->execution_stack, 1);
-      es = process->state = &g_array_index(process->execution_stack, 
-          LttvExecutionState, 0);
+
+  if(pid == 0) {
+    nb_cpus = ltt_trace_get_num_cpu(ts->parent.t);
+    for(i=0; i<nb_cpus; i++) {
+      process = lttv_state_find_process(ts, i, pid);
+      g_assert(process != NULL);
+
+      process->ppid = parent_pid;
+      process->tgid = tgid;
+      process->name = g_quark_from_string(command);
+      es =
+        &g_array_index(process->execution_stack, LttvExecutionState, 0);
       process->type = LTTV_STATE_KERNEL_THREAD;
-      es->t = LTTV_STATE_MODE_UNKNOWN;
-      es->s = LTTV_STATE_UNNAMED;
-      es->n = LTTV_STATE_SUBMODE_UNKNOWN;
-#if 0
-      es->t = LTTV_STATE_SYSCALL;
-      es->s = status;
-      es->n = submode;
-#endif //0
+    }
+
+  } else {
+    /* The process might exist if a process was forked while performing the
+     * state dump. */
+    process = lttv_state_find_process(ts, ANY_CPU, pid);
+    if(process == NULL) {
+      parent_process = lttv_state_find_process(ts, ANY_CPU, parent_pid);
+      process = lttv_state_create_process(ts, parent_process, cpu,
+                                pid, tgid, g_quark_from_string(command),
+                                &s->parent.timestamp);
+    
+      /* Keep the stack bottom : a running user mode */
+      /* Disabled because of inconsistencies in the current statedump states. */
+      if(type == LTTV_STATE_KERNEL_THREAD) {
+        /* Only keep the bottom 
+         * FIXME Kernel thread : can be in syscall or interrupt or trap. */
+        /* Will cause expected trap when in fact being syscall (even after end of
+         * statedump event)
+         * Will cause expected interrupt when being syscall. (only before end of
+         * statedump event) */
+        // This will cause a "popping last state on stack, ignoring it."
+        process->execution_stack = g_array_set_size(process->execution_stack, 1);
+        es = process->state = &g_array_index(process->execution_stack, 
+            LttvExecutionState, 0);
+        process->type = LTTV_STATE_KERNEL_THREAD;
+        es->t = LTTV_STATE_MODE_UNKNOWN;
+        es->s = LTTV_STATE_UNNAMED;
+        es->n = LTTV_STATE_SUBMODE_UNKNOWN;
+  #if 0
+        es->t = LTTV_STATE_SYSCALL;
+        es->s = status;
+        es->n = submode;
+  #endif //0
+      } else {
+        /* User space process :
+         * bottom : user mode
+         * either currently running or scheduled out.
+         * can be scheduled out because interrupted in (user mode or in syscall)
+         * or because of an explicit call to the scheduler in syscall. Note that
+         * the scheduler call comes after the irq_exit, so never in interrupt
+         * context. */
+        // temp workaround : set size to 1 : only have user mode bottom of stack.
+        // will cause g_info message of expected syscall mode when in fact being
+        // in user mode. Can also cause expected trap when in fact being user
+        // mode in the event of a page fault reenabling interrupts in the handler.
+        // Expected syscall and trap can also happen after the end of statedump
+        // This will cause a "popping last state on stack, ignoring it."
+        process->execution_stack = g_array_set_size(process->execution_stack, 1);
+        es = process->state = &g_array_index(process->execution_stack, 
+            LttvExecutionState, 0);
+        es->t = LTTV_STATE_MODE_UNKNOWN;
+        es->s = LTTV_STATE_UNNAMED;
+        es->n = LTTV_STATE_SUBMODE_UNKNOWN;
+  #if 0
+        es->t = LTTV_STATE_USER_MODE;
+        es->s = status;
+        es->n = submode;
+  #endif //0
+      }
+  #if 0
+      /* UNKNOWN STATE */
+      {
+        es = process->state = &g_array_index(process->execution_stack, 
+            LttvExecutionState, 1);
+        es->t = LTTV_STATE_MODE_UNKNOWN;
+        es->s = LTTV_STATE_UNNAMED;
+        es->n = LTTV_STATE_SUBMODE_UNKNOWN;
+      }
+  #endif //0
     } else {
-      /* User space process :
-       * bottom : user mode
-       * either currently running or scheduled out.
-       * can be scheduled out because interrupted in (user mode or in syscall)
-       * or because of an explicit call to the scheduler in syscall. Note that
-       * the scheduler call comes after the irq_exit, so never in interrupt
-       * context. */
-      // temp workaround : set size to 1 : only have user mode bottom of stack.
-      // will cause g_info message of expected syscall mode when in fact being
-      // in user mode. Can also cause expected trap when in fact being user
-      // mode in the event of a page fault reenabling interrupts in the handler.
-      // Expected syscall and trap can also happen after the end of statedump
-      // This will cause a "popping last state on stack, ignoring it."
-      process->execution_stack = g_array_set_size(process->execution_stack, 1);
-      es = process->state = &g_array_index(process->execution_stack, 
-          LttvExecutionState, 0);
-      es->t = LTTV_STATE_MODE_UNKNOWN;
-      es->s = LTTV_STATE_UNNAMED;
-      es->n = LTTV_STATE_SUBMODE_UNKNOWN;
+      /* The process has already been created :
+       * Probably was forked while dumping the process state or
+       * was simply scheduled in prior to get the state dump event.
+       */
+      process->ppid = parent_pid;
+      process->tgid = tgid;
+      process->name = g_quark_from_string(command);
+      process->type = type;
+      es =
+        &g_array_index(process->execution_stack, LttvExecutionState, 0);
 #if 0
-      es->t = LTTV_STATE_USER_MODE;
-      es->s = status;
-      es->n = submode;
+      if(es->t == LTTV_STATE_MODE_UNKNOWN) {
+        if(type == LTTV_STATE_KERNEL_THREAD)
+          es->t = LTTV_STATE_SYSCALL;
+        else
+          es->t = LTTV_STATE_USER_MODE;
+      }
 #endif //0
+      /* Don't mess around with the stack, it will eventually become
+       * ok after the end of state dump. */
     }
-#if 0
-    /* UNKNOWN STATE */
-    {
-      es = process->state = &g_array_index(process->execution_stack, 
-          LttvExecutionState, 1);
-      es->t = LTTV_STATE_MODE_UNKNOWN;
-      es->s = LTTV_STATE_UNNAMED;
-      es->n = LTTV_STATE_SUBMODE_UNKNOWN;
-    }
-#endif //0
-  } else {
-    /* The process has already been created :
-     * Probably was forked while dumping the process state or
-     * was simply scheduled in prior to get the state dump event.
-     * We know for sure if it is a user space thread.
-     */
-    process->ppid = parent_pid;
-    process->tgid = tgid;
-    process->name = g_quark_from_string(command);
-    es =
-      &g_array_index(process->execution_stack, LttvExecutionState, 0);
-    if(type != LTTV_STATE_KERNEL_THREAD)
-      es->t = LTTV_STATE_USER_MODE;
-    /* Don't mess around with the stack, it will eventually become
-     * ok after the end of state dump. */
   }
   
   return FALSE;
@@ -2642,13 +2705,13 @@ void lttv_state_add_event_hooks(LttvTracesetState *self)
     if(ret) hn--;
 
     ret = lttv_trace_find_hook(ts->parent.t,
-        LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_ENTRY,
+        LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_TRAP_ENTRY,
         LTT_FIELD_TRAP_ID, 0, 0,
         trap_entry, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
     if(ret) hn--;
 
     ret = lttv_trace_find_hook(ts->parent.t,
-        LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_EXIT,
+        LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_TRAP_EXIT,
         0, 0, 0, 
         trap_exit, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
     if(ret) hn--;
@@ -2678,32 +2741,32 @@ void lttv_state_add_event_hooks(LttvTracesetState *self)
     if(ret) hn--;
 
     ret = lttv_trace_find_hook(ts->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,
         schedchange, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
     if(ret) hn--;
 
     ret = lttv_trace_find_hook(ts->parent.t,
-        LTT_FACILITY_PROCESS, LTT_EVENT_FORK,
-        LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID, LTT_FIELD_TGID,
+        LTT_FACILITY_KERNEL, LTT_EVENT_PROCESS_FORK,
+        LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID, LTT_FIELD_CHILD_TGID,
         process_fork, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
     if(ret) hn--;
 
     ret = lttv_trace_find_hook(ts->parent.t,
-        LTT_FACILITY_PROCESS, LTT_EVENT_KERNEL_THREAD,
+        LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_KTHREAD_CREATE,
         LTT_FIELD_PID, 0, 0,
         process_kernel_thread, NULL, &g_array_index(hooks, LttvTraceHook,
           hn++));
     if(ret) hn--;
 
     ret = lttv_trace_find_hook(ts->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.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++));
     if(ret) hn--;
@@ -2722,13 +2785,13 @@ void lttv_state_add_event_hooks(LttvTracesetState *self)
 
      /* statedump-related hooks */
     ret = lttv_trace_find_hook(ts->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,
         enum_process_state, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
     if(ret) hn--;
 
     ret = lttv_trace_find_hook(ts->parent.t,
-        LTT_FACILITY_STATEDUMP, LTT_EVENT_STATEDUMP_END,
+        LTT_FACILITY_LIST, LTT_EVENT_STATEDUMP_END,
         0, 0, 0,
         statedump_end, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
     if(ret) hn--;
@@ -3418,9 +3481,8 @@ static void module_init()
   
   LTT_FACILITY_KERNEL     = g_quark_from_string("kernel");
   LTT_FACILITY_KERNEL_ARCH = g_quark_from_string("kernel_arch");
-  LTT_FACILITY_PROCESS    = g_quark_from_string("process");
   LTT_FACILITY_FS    = g_quark_from_string("fs");
-  LTT_FACILITY_STATEDUMP    = g_quark_from_string("statedump");
+  LTT_FACILITY_LIST = g_quark_from_string("list");
   LTT_FACILITY_USER_GENERIC    = g_quark_from_string("user_generic");
 
   
@@ -3432,13 +3494,13 @@ static void module_init()
   LTT_EVENT_IRQ_EXIT      = g_quark_from_string("irq_exit");
   LTT_EVENT_SOFT_IRQ_ENTRY     = g_quark_from_string("soft_irq_entry");
   LTT_EVENT_SOFT_IRQ_EXIT      = g_quark_from_string("soft_irq_exit");
-  LTT_EVENT_SCHEDCHANGE   = g_quark_from_string("schedchange");
-  LTT_EVENT_FORK          = g_quark_from_string("fork");
-  LTT_EVENT_KERNEL_THREAD = g_quark_from_string("kernel_thread");
-  LTT_EVENT_EXIT          = g_quark_from_string("exit");
-  LTT_EVENT_FREE          = g_quark_from_string("free");
+  LTT_EVENT_SCHED_SCHEDULE   = g_quark_from_string("sched_schedule");
+  LTT_EVENT_PROCESS_FORK          = g_quark_from_string("process_fork");
+  LTT_EVENT_KTHREAD_CREATE = g_quark_from_string("kthread_create");
+  LTT_EVENT_PROCESS_EXIT          = g_quark_from_string("process_exit");
+  LTT_EVENT_PROCESS_FREE          = g_quark_from_string("process_free");
   LTT_EVENT_EXEC          = g_quark_from_string("exec");
-  LTT_EVENT_ENUM_PROCESS_STATE  = g_quark_from_string("enumerate_process_state");
+  LTT_EVENT_PROCESS_STATE  = g_quark_from_string("process_state");
   LTT_EVENT_STATEDUMP_END  = g_quark_from_string("statedump_end");
   LTT_EVENT_FUNCTION_ENTRY  = g_quark_from_string("function_entry");
   LTT_EVENT_FUNCTION_EXIT  = g_quark_from_string("function_exit");
@@ -3449,13 +3511,14 @@ static void module_init()
   LTT_FIELD_TRAP_ID       = g_quark_from_string("trap_id");
   LTT_FIELD_IRQ_ID        = g_quark_from_string("irq_id");
   LTT_FIELD_SOFT_IRQ_ID        = g_quark_from_string("softirq_id");
-  LTT_FIELD_OUT           = g_quark_from_string("out");
-  LTT_FIELD_IN            = g_quark_from_string("in");
-  LTT_FIELD_OUT_STATE     = g_quark_from_string("out_state");
+  LTT_FIELD_PREV_PID            = g_quark_from_string("prev_pid");
+  LTT_FIELD_NEXT_PID           = g_quark_from_string("next_pid");
+  LTT_FIELD_PREV_STATE     = g_quark_from_string("prev_state");
   LTT_FIELD_PARENT_PID    = g_quark_from_string("parent_pid");
   LTT_FIELD_CHILD_PID     = g_quark_from_string("child_pid");
   LTT_FIELD_PID           = g_quark_from_string("pid");
   LTT_FIELD_TGID          = g_quark_from_string("tgid");
+  LTT_FIELD_CHILD_TGID    = g_quark_from_string("child_tgid");
   LTT_FIELD_FILENAME      = g_quark_from_string("filename");
   LTT_FIELD_NAME          = g_quark_from_string("name");
   LTT_FIELD_TYPE          = g_quark_from_string("type");
@@ -3465,6 +3528,9 @@ static void module_init()
   LTT_FIELD_THIS_FN       = g_quark_from_string("this_fn");
   LTT_FIELD_CALL_SITE     = g_quark_from_string("call_site");
   
+  LTTV_CPU_UNKNOWN = g_quark_from_string("unknown");
+  LTTV_CPU_IDLE = g_quark_from_string("idle");
+  LTTV_CPU_BUSY = g_quark_from_string("busy");
 }
 
 static void module_destroy() 
This page took 0.03118 seconds and 4 git commands to generate.