X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Fstate.h;h=85ff18943c589b6abdf00ef901ac537835776d72;hb=2f5bc9151043ee85d44695715734eea07ee04ecb;hp=f8d62d4cd2e50480559ecb5b8ea6f580a3242b93;hpb=b3fd4c02566c71add135fbc715fddafc9b03b141;p=lttv.git

diff --git a/ltt/branches/poly/lttv/lttv/state.h b/ltt/branches/poly/lttv/lttv/state.h
index f8d62d4c..85ff1894 100644
--- a/ltt/branches/poly/lttv/lttv/state.h
+++ b/ltt/branches/poly/lttv/lttv/state.h
@@ -60,7 +60,8 @@ extern GQuark
     LTT_FACILITY_KERNEL_ARCH,
     LTT_FACILITY_PROCESS,
     LTT_FACILITY_FS,
-		LTT_FACILITY_STATEDUMP;
+		LTT_FACILITY_STATEDUMP,
+		LTT_FACILITY_USER_GENERIC;
 
 /* Events Quarks */
 
@@ -75,10 +76,13 @@ extern GQuark
     LTT_EVENT_SOFT_IRQ_EXIT,
     LTT_EVENT_SCHEDCHANGE,
     LTT_EVENT_FORK,
+    LTT_EVENT_KERNEL_THREAD,
     LTT_EVENT_EXIT,
     LTT_EVENT_FREE,
     LTT_EVENT_EXEC,
-		LTT_EVENT_ENUM_PROCESS_STATE;
+		LTT_EVENT_ENUM_PROCESS_STATE,
+		LTT_EVENT_FUNCTION_ENTRY,
+		LTT_EVENT_FUNCTION_EXIT;
 
 /* Fields Quarks */
 
@@ -97,7 +101,9 @@ extern GQuark
     LTT_FIELD_NAME,
     LTT_FIELD_MODE,
     LTT_FIELD_SUBMODE,
-    LTT_FIELD_STATUS;
+    LTT_FIELD_STATUS,
+		LTT_FIELD_THIS_FN,
+		LTT_FIELD_CALL_SITE;
 
 typedef struct _LttvTracesetState LttvTracesetState;
 typedef struct _LttvTracesetStateClass LttvTracesetStateClass;
@@ -186,10 +192,10 @@ typedef struct _LttvExecutionState {
   LttvExecutionSubmode n;
   LttTime entry;
   LttTime change;
+	LttTime cum_cpu_time;
   LttvProcessStatus s;
 } LttvExecutionState;
 
-
 typedef struct _LttvProcessState {
   guint pid;
   guint ppid;
@@ -204,8 +210,12 @@ typedef struct _LttvProcessState {
        * (Mathieu) */
   guint cpu;                /* CPU where process is scheduled (being either in
                                the active or inactive runqueue)*/
+	gboolean kernel_thread;		/* Is this thread a kernel_thread ? */
 //  guint  last_tracefile_index;    /* index in the trace for cpu tracefile */
+	LttvTracefileState	*usertrace;		/* Associated usertrace */
   /* opened file descriptors, address map?... */
+  GArray *user_stack;					/* User space function call stack */
+	guint64	current_function;
 } LttvProcessState;
 
 #define ANY_CPU 0 /* For clarity sake : a call to lttv_state_find_process for
@@ -257,10 +267,13 @@ struct _LttvTraceState {
 
   GHashTable *processes;  /* LttvProcessState objects indexed by pid and
                              last_cpu */
+	GHashTable *usertraces;	/* GPtrArray objects indexed by pid, containing
+														 pointers to LttvTracefileState objects. */
   guint nb_event, save_interval;
   /* Block/char devices, locks, memory pages... */
   GQuark *eventtype_names;
   GQuark *syscall_names;
+	guint  nb_syscalls;
   GQuark *trap_names;
   GQuark *irq_names;
   GQuark *soft_irq_names;
@@ -268,7 +281,6 @@ struct _LttvTraceState {
 
   /* Array of per cpu running process */
   LttvProcessState **running_process;
-  
 };
 
 struct _LttvTraceStateClass {
@@ -288,6 +300,8 @@ void lttv_state_restore(LttvTraceState *self, LttvAttribute *container);
 void lttv_state_state_saved_free(LttvTraceState *self, 
     LttvAttribute *container);
 
+int lttv_state_pop_state_cleanup(LttvProcessState *process,
+		LttvTracefileState *tfs);
 
 #define LTTV_TRACEFILE_STATE_TYPE  (lttv_tracefile_state_get_type ())
 #define LTTV_TRACEFILE_STATE(obj)  (G_TYPE_CHECK_INSTANCE_CAST ((obj), LTTV_TRACEFILE_STATE_TYPE, LttvTracefileState))
@@ -301,6 +315,7 @@ struct _LttvTracefileState {
 
   //LttvProcessState *process;
   GQuark tracefile_name;
+	guint cpu;	/* Current cpu of the tracefile */
 //  guint saved_position;
 };