X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Fstate.h;h=5f22b356f7240317dfb6f4db353a8ee3a0e23dc6;hb=598026baa39b5672b77d46e70a1434f975d52486;hp=f1e3f6d187ef0823dc2858b679b67ce93d45c630;hpb=fcc08e1e49ca66dffe10ce9d27216421482663f0;p=lttv.git

diff --git a/ltt/branches/poly/lttv/lttv/state.h b/ltt/branches/poly/lttv/lttv/state.h
index f1e3f6d1..5f22b356 100644
--- a/ltt/branches/poly/lttv/lttv/state.h
+++ b/ltt/branches/poly/lttv/lttv/state.h
@@ -58,9 +58,8 @@
 extern GQuark
     LTT_FACILITY_KERNEL,
     LTT_FACILITY_KERNEL_ARCH,
-    LTT_FACILITY_PROCESS,
     LTT_FACILITY_FS,
-    LTT_FACILITY_STATEDUMP,
+    LTT_FACILITY_LIST,
     LTT_FACILITY_USER_GENERIC;
 
 /* Events Quarks */
@@ -74,13 +73,14 @@ extern 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,
     LTT_EVENT_THREAD_BRAND;
@@ -92,9 +92,9 @@ extern 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,
@@ -181,7 +181,6 @@ typedef GQuark LttvProcessStatus;
 
 extern LttvProcessStatus
   LTTV_STATE_UNNAMED,
-  LTTV_STATE_UNBRANDED,
   LTTV_STATE_WAIT_FORK,
   LTTV_STATE_WAIT_CPU,
   LTTV_STATE_EXIT,
@@ -190,12 +189,22 @@ extern LttvProcessStatus
   LTTV_STATE_RUN,
   LTTV_STATE_DEAD;
 
+extern GQuark
+  LTTV_STATE_UNBRANDED;
+
 typedef GQuark LttvProcessType;
 
 extern LttvProcessType
   LTTV_STATE_USER_THREAD,
   LTTV_STATE_KERNEL_THREAD;
 
+typedef GQuark LttvCPUMode;
+extern LttvCPUMode
+  LTTV_CPU_UNKNOWN,
+  LTTV_CPU_IDLE,
+  LTTV_CPU_BUSY,
+  LTTV_CPU_IRQ;
+
 typedef struct _LttvExecutionState {
   LttvExecutionMode t;
   LttvExecutionSubmode n;
@@ -227,6 +236,7 @@ typedef struct _LttvProcessState {
   GArray *user_stack;          /* User space function call stack */
   guint64  current_function;
   LttvProcessType type;        /* kernel thread or user space ? */
+  guint target_pid; /* target PID of the current event. */
 } LttvProcessState;
 
 #define ANY_CPU 0 /* For clarity sake : a call to lttv_state_find_process for
@@ -237,13 +247,14 @@ lttv_state_find_process(LttvTraceState *ts, guint cpu, guint pid);
 
 LttvProcessState *
 lttv_state_find_process_or_create(LttvTraceState *ts, guint cpu, guint pid,
-    LttTime *timestamp);
+    const LttTime *timestamp);
 
 LttvProcessState *
 lttv_state_create_process(LttvTraceState *tcs, LttvProcessState *parent, 
     guint cpu, guint pid, guint tgid, GQuark name, const LttTime *timestamp);
 
 void lttv_state_write(LttvTraceState *self, LttTime t, FILE *fp);
+void lttv_state_write_raw(LttvTraceState *self, LttTime t, FILE *fp);
 
 /* The LttvTracesetState, LttvTraceState and LttvTracefileState types
    inherit from the corresponding Context objects defined in processTrace. */
@@ -273,6 +284,11 @@ GType lttv_traceset_state_get_type (void);
 #define LTTV_IS_TRACE_STATE_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), LTTV_TRACE_STATE_TYPE))
 #define LTTV_TRACE_STATE_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst), LTTV_TRACE_STATE_TYPE, LttvTraceStateClass))
 
+typedef struct _LttvCPUState {
+  LttvCPUMode previous_state;
+  LttvCPUMode present_state;
+} LttvCPUState;
+
 struct _LttvTraceState {
   LttvTraceContext parent;
 
@@ -287,12 +303,16 @@ struct _LttvTraceState {
   guint  nb_syscalls;
   GQuark *trap_names;
   guint  nb_traps;
+  guint  nb_irqs;
+  guint  nb_softirqs;
   GQuark *irq_names;
   GQuark *soft_irq_names;
   LttTime *max_time_state_recomputed_in_seek;
 
   /* Array of per cpu running process */
   LttvProcessState **running_process;
+  gboolean has_precomputed_states;
+  LttvCPUState *cpu_states; /* state of each cpu */
 };
 
 struct _LttvTraceStateClass {
@@ -325,10 +345,9 @@ int lttv_state_pop_state_cleanup(LttvProcessState *process,
 struct _LttvTracefileState {
   LttvTracefileContext parent;
 
-  //LttvProcessState *process;
   GQuark tracefile_name;
-  guint cpu;  /* Current cpu of the tracefile */
-//  guint saved_position;
+  guint cpu;  /* Current cpu of the tracefile */ /* perhaps merge in cpu_state */
+  LttvCPUState *cpu_state; /* cpu resource state */
 };
 
 struct _LttvTracefileStateClass {
@@ -337,5 +356,29 @@ struct _LttvTracefileStateClass {
 
 GType lttv_tracefile_state_get_type (void);
 
+static inline guint lttv_state_get_target_pid(LttvTracefileState *tfs)
+{
+  LttvTraceState *ts = (LttvTraceState*)tfs->parent.t_context;
+  guint cpu = tfs->cpu;
+  LttvProcessState *process = ts->running_process[cpu];
+
+  if(tfs->parent.target_pid >= 0) return tfs->parent.target_pid;
+  else return process->pid;
+}
+
+
+#define HDR_PROCESS 0
+#define HDR_ES 1
+#define HDR_USER_STACK 2
+#define HDR_USERTRACE 3
+#define HDR_PROCESS_STATE 4
+#define HDR_CPU 5
+#define HDR_TRACEFILE 6
+#define HDR_TRACESET 7
+#define HDR_TRACE 8
+#define HDR_QUARKS 9
+#define HDR_QUARK 10
+
+
 
 #endif // STATE_H