lttv and lib ltt new compiles

[lttv.git] / ltt / branches / poly / lttv / lttv / state.h

diff --git a/ltt/branches/poly/lttv/lttv/state.h b/ltt/branches/poly/lttv/lttv/state.h
index 7529dc6545fa0410af4e957e8c9307391acdb0f5..f8f7a5775e59da7d1cede732048b0abf04b2a499 100644 (file)
--- a/ltt/branches/poly/lttv/lttv/state.h
+++ b/ltt/branches/poly/lttv/lttv/state.h
@@ -28,7 +28,7 @@
    sufficient for the analysis, and possibly organized quite differently.
 
    The state information is added to LttvTracesetContext, LttvTraceContext 
-   and LttvTracefileContext objects, used by processTrace, through
+   and LttvTracefileContext objects, used by process_traceset, through
    subtyping. The context objects already reflect the multiple tracefiles
    (one per cpu) per trace and multiple traces per trace set. The state
    objects defined here simply add fields to the relevant context objects. 
@@ -48,6 +48,46 @@
    contains an execution mode stack (e.g. irq within system call, called
    from user mode). */
 
+/* Priority of state hooks */
+#define LTTV_PRIO_STATE 25
+
+#define LTTV_STATE_SAVE_INTERVAL 50000
+
+/* Facilities Quarks */
+
+extern GQuark
+    LTT_FACILITY_KERNEL,
+    LTT_FACILITY_PROCESS;
+
+/* Events Quarks */
+
+extern GQuark 
+    LTT_EVENT_SYSCALL_ENTRY,
+    LTT_EVENT_SYSCALL_EXIT,
+    LTT_EVENT_TRAP_ENTRY,
+    LTT_EVENT_TRAP_EXIT,
+    LTT_EVENT_IRQ_ENTRY,
+    LTT_EVENT_IRQ_EXIT,
+    LTT_EVENT_SCHEDCHANGE,
+    LTT_EVENT_FORK,
+    LTT_EVENT_EXIT,
+    LTT_EVENT_FREE;
+
+/* Fields Quarks */
+
+extern GQuark 
+    LTT_FIELD_SYSCALL_ID,
+    LTT_FIELD_TRAP_ID,
+    LTT_FIELD_IRQ_ID,
+    LTT_FIELD_OUT,
+    LTT_FIELD_IN,
+    LTT_FIELD_OUT_STATE,
+    LTT_FIELD_PARENT_PID,
+    LTT_FIELD_CHILD_PID,
+    LTT_FIELD_PID;
+
+extern GQuark LTT_EVENT_SYSCALL_ENTRY;
+
 typedef struct _LttvTracesetState LttvTracesetState;
 typedef struct _LttvTracesetStateClass LttvTracesetStateClass;
 
@@ -57,13 +97,19 @@ typedef struct _LttvTraceStateClass LttvTraceStateClass;
 typedef struct _LttvTracefileState LttvTracefileState;
 typedef struct _LttvTracefileStateClass LttvTracefileStateClass;
 
+gint lttv_state_hook_add_event_hooks(void *hook_data, void *call_data);
 void lttv_state_add_event_hooks(LttvTracesetState *self);
 
+gint lttv_state_hook_remove_event_hooks(void *hook_data, void *call_data);
 void lttv_state_remove_event_hooks(LttvTracesetState *self);
 
 void lttv_state_save_add_event_hooks(LttvTracesetState *self);
+// Hook wrapper. call_data is a trace context.
+gint lttv_state_save_hook_add_event_hooks(void *hook_data, void *call_data);
 
 void lttv_state_save_remove_event_hooks(LttvTracesetState *self);
+// Hook wrapper. call_data is a trace context.
+gint lttv_state_save_hook_remove_event_hooks(void *hook_data, void *call_data);
 
 void lttv_state_traceset_seek_time_closest(LttvTracesetState *self, LttTime t);
 
@@ -117,6 +163,7 @@ extern LttvProcessStatus
   LTTV_STATE_WAIT_FORK,
   LTTV_STATE_WAIT_CPU,
   LTTV_STATE_EXIT,
+  LTTV_STATE_ZOMBIE,
   LTTV_STATE_WAIT,
   LTTV_STATE_RUN;
 
@@ -140,16 +187,13 @@ typedef struct _LttvProcessState {
   GArray *execution_stack;         /* Array of LttvExecutionState */
   LttvExecutionState *state;       /* Top of interrupt stack */
   GQuark last_cpu;                /* Last CPU where process was scheduled */
+  guint last_cpu_index;            /* index in the trace for cpu tracefile */
   /* opened file descriptors, address map?... */
 } LttvProcessState;
 
-
 LttvProcessState *
 lttv_state_find_process(LttvTracefileState *tfs, guint pid);
 
-LttvProcessState *
-lttv_state_find_process_from_trace(LttvTraceState *ts, GQuark cpu, guint pid);
-
 LttvProcessState *
 lttv_state_find_process_or_create(LttvTracefileState *tfs, guint pid);
 
@@ -190,7 +234,8 @@ GType lttv_traceset_state_get_type (void);
 struct _LttvTraceState {
   LttvTraceContext parent;
 
-  GHashTable *processes;  /* LttvProcessState objects indexed by pid */
+  GHashTable *processes;  /* LttvProcessState objects indexed by pid and
+                             last_cpu */
   guint nb_event, save_interval;
   /* Block/char devices, locks, memory pages... */
   GQuark *eventtype_names;
@@ -230,7 +275,7 @@ struct _LttvTracefileState {
 
   LttvProcessState *process;
   GQuark cpu_name;
-  guint saved_position;
+//  guint saved_position;
 };
 
 struct _LttvTracefileStateClass {