update script
[lttv.git] / ltt / branches / poly / lttv / lttv / state.c
index a3a3102a50039a3adbb2e7c58003bbd07c5f2046..85a50e80972cbea841bec0d860048022c1f2bd6d 100644 (file)
@@ -40,7 +40,7 @@ GQuark
     LTT_FACILITY_PROCESS,
     LTT_FACILITY_FS,
     LTT_FACILITY_STATEDUMP,
-               LTT_FACILITY_USER_GENERIC;
+    LTT_FACILITY_USER_GENERIC;
 
 /* Events Quarks */
 
@@ -60,9 +60,9 @@ GQuark
     LTT_EVENT_FREE,
     LTT_EVENT_EXEC,
     LTT_EVENT_ENUM_PROCESS_STATE,
-               LTT_EVENT_FUNCTION_ENTRY,
-               LTT_EVENT_FUNCTION_EXIT,
-               LTT_EVENT_THREAD_BRAND;
+    LTT_EVENT_FUNCTION_ENTRY,
+    LTT_EVENT_FUNCTION_EXIT,
+    LTT_EVENT_THREAD_BRAND;
 
 /* Fields Quarks */
 
@@ -77,14 +77,15 @@ GQuark
     LTT_FIELD_PARENT_PID,
     LTT_FIELD_CHILD_PID,
     LTT_FIELD_PID,
+    LTT_FIELD_TGID,
     LTT_FIELD_FILENAME,
     LTT_FIELD_NAME,
     LTT_FIELD_TYPE,
     LTT_FIELD_MODE,
     LTT_FIELD_SUBMODE,
     LTT_FIELD_STATUS,
-               LTT_FIELD_THIS_FN,
-               LTT_FIELD_CALL_SITE;
+    LTT_FIELD_THIS_FN,
+    LTT_FIELD_CALL_SITE;
 
 LttvExecutionMode
   LTTV_STATE_MODE_UNKNOWN,
@@ -111,7 +112,7 @@ LttvProcessStatus
 
 LttvProcessType
   LTTV_STATE_USER_THREAD,
-       LTTV_STATE_KERNEL_THREAD;
+  LTTV_STATE_KERNEL_THREAD;
 
 static GQuark
   LTTV_STATE_TRACEFILES,
@@ -188,13 +189,13 @@ gboolean process_equal(gconstpointer a, gconstpointer b)
 
 static void delete_usertrace(gpointer key, gpointer value, gpointer user_data)
 {
-       g_tree_destroy((GTree*)value);
+  g_tree_destroy((GTree*)value);
 }
 
 static void lttv_state_free_usertraces(GHashTable *usertraces)
 {
-       g_hash_table_foreach(usertraces, delete_usertrace, NULL);
-       g_hash_table_destroy(usertraces);
+  g_hash_table_foreach(usertraces, delete_usertrace, NULL);
+  g_hash_table_destroy(usertraces);
 }
 
 
@@ -210,9 +211,9 @@ restore_init_state(LttvTraceState *self)
   
   /* Free the process tables */
   if(self->processes != NULL) lttv_state_free_process_table(self->processes);
-       if(self->usertraces != NULL) lttv_state_free_usertraces(self->usertraces);
+  if(self->usertraces != NULL) lttv_state_free_usertraces(self->usertraces);
   self->processes = g_hash_table_new(process_hash, process_equal);
-       self->usertraces = g_hash_table_new(g_direct_hash, g_direct_equal);
+  self->usertraces = g_hash_table_new(g_direct_hash, g_direct_equal);
   self->nb_event = 0;
 
   /* Seek time to beginning */
@@ -230,7 +231,7 @@ restore_init_state(LttvTraceState *self)
   
   /* Put the per cpu running_process to beginning state : process 0. */
   for(i=0; i< nb_cpus; i++) {
-    self->running_process[i] = lttv_state_create_process(self, NULL, i, 0,
+    self->running_process[i] = lttv_state_create_process(self, NULL, i, 0, 0,
         LTTV_STATE_UNNAMED, &start_time);
     self->running_process[i]->state->s = LTTV_STATE_RUN;
     self->running_process[i]->cpu = i;
@@ -256,17 +257,17 @@ restore_init_state(LttvTraceState *self)
 //static LttTime time_zero = {0,0};
 
 static gint compare_usertraces(gconstpointer a, gconstpointer b, 
-               gpointer user_data)
+    gpointer user_data)
 {
-       const LttTime *t1 = (const LttTime *)a;
-       const LttTime *t2 = (const LttTime *)b;
+  const LttTime *t1 = (const LttTime *)a;
+  const LttTime *t2 = (const LttTime *)b;
 
-       return ltt_time_compare(*t1, *t2);
+  return ltt_time_compare(*t1, *t2);
 }
 
 static void free_usertrace_key(gpointer data)
 {
-       g_free(data);
+  g_free(data);
 }
 
 static void
@@ -312,38 +313,38 @@ init(LttvTracesetState *self, LttvTraceset *ts)
           LTTV_TRACEFILE_STATE(g_array_index(tc->tracefiles,
                                           LttvTracefileContext*, j));
       tfcs->tracefile_name = ltt_tracefile_name(tfcs->parent.tf);
-                       tfcs->cpu = ltt_tracefile_cpu(tfcs->parent.tf);
-#if 0          
-                       if(ltt_tracefile_tid(tfcs->parent.tf) != 0) {
-                               /* It's a Usertrace */
-                               LttvProcessState *process;
-                               LttTime timestamp = 
-                                       ltt_interpolate_time_from_tsc(tfcs->parent.tf,
-                                                       ltt_tracefile_creation(tfcs->parent.tf));
-                               process = lttv_state_find_process_or_create(
-                                                                                               tcs,
-                                                                                               0, ltt_tracefile_tid(tfcs->parent.tf),
-                                                                                               &timestamp);
-                               process->usertrace = tfcs;
-                       }
+      tfcs->cpu = ltt_tracefile_cpu(tfcs->parent.tf);
+#if 0    
+      if(ltt_tracefile_tid(tfcs->parent.tf) != 0) {
+        /* It's a Usertrace */
+        LttvProcessState *process;
+        LttTime timestamp = 
+          ltt_interpolate_time_from_tsc(tfcs->parent.tf,
+              ltt_tracefile_creation(tfcs->parent.tf));
+        process = lttv_state_find_process_or_create(
+                        tcs,
+                        0, ltt_tracefile_tid(tfcs->parent.tf),
+                        &timestamp);
+        process->usertrace = tfcs;
+      }
     }
 #endif //0
-                       if(ltt_tracefile_tid(tfcs->parent.tf) != 0) {
-                               /* It's a Usertrace */
-                               guint tid = ltt_tracefile_tid(tfcs->parent.tf);
-                               GTree *usertrace_tree = (GTree*)g_hash_table_lookup(tcs->usertraces,
-                                               (gconstpointer)tid);
-                               if(!usertrace_tree) {
-                                       usertrace_tree = g_tree_new_full(compare_usertraces,
-                                                       NULL, free_usertrace_key, NULL);
-                                       g_hash_table_insert(tcs->usertraces,
-                                                       (gpointer)tid, usertrace_tree);
-                               }
-                               LttTime *timestamp = g_new(LttTime, 1);
-                               *timestamp = ltt_interpolate_time_from_tsc(tfcs->parent.tf,
-                                                       ltt_tracefile_creation(tfcs->parent.tf));
-                               g_tree_insert(usertrace_tree, timestamp, tfcs);
-                       }
+      if(ltt_tracefile_tid(tfcs->parent.tf) != 0) {
+        /* It's a Usertrace */
+        guint tid = ltt_tracefile_tid(tfcs->parent.tf);
+        GTree *usertrace_tree = (GTree*)g_hash_table_lookup(tcs->usertraces,
+            (gconstpointer)tid);
+        if(!usertrace_tree) {
+          usertrace_tree = g_tree_new_full(compare_usertraces,
+              NULL, free_usertrace_key, NULL);
+          g_hash_table_insert(tcs->usertraces,
+              (gpointer)tid, usertrace_tree);
+        }
+        LttTime *timestamp = g_new(LttTime, 1);
+        *timestamp = ltt_interpolate_time_from_tsc(tfcs->parent.tf,
+              ltt_tracefile_creation(tfcs->parent.tf));
+        g_tree_insert(usertrace_tree, timestamp, tfcs);
+      }
     }
 
   }
@@ -377,7 +378,7 @@ fini(LttvTracesetState *self)
     g_free(tcs->running_process);
     tcs->running_process = NULL;
     lttv_state_free_process_table(tcs->processes);
-               lttv_state_free_usertraces(tcs->usertraces);
+    lttv_state_free_usertraces(tcs->usertraces);
     tcs->processes = NULL;
     tcs->usertraces = NULL;
   }
@@ -419,24 +420,43 @@ static void write_process_state(gpointer key, gpointer value,
   FILE *fp = (FILE *)user_data;
 
   guint i;
+  guint64 address;
 
   process = (LttvProcessState *)value;
   fprintf(fp,
-"  <PROCESS CORE=%p PID=%u PPID=%u TYPE=\"%s\"CTIME_S=%lu CTIME_NS=%lu NAME=\"%s\" BRAND=\"%s\" CPU=\"%u\">\n",
-      process, process->pid, process->ppid, g_quark_to_string(process->type),
-                       process->creation_time.tv_sec,
-      process->creation_time.tv_nsec, g_quark_to_string(process->name),
+"  <PROCESS CORE=%p PID=%u TGID=%u PPID=%u TYPE=\"%s\" CTIME_S=%lu CTIME_NS=%lu ITIME_S=%lu ITIME_NS=%lu NAME=\"%s\" BRAND=\"%s\" CPU=\"%u\" PROCESS_TYPE=%u>\n",
+      process, process->pid, process->tgid, process->ppid,
+      g_quark_to_string(process->type),
+      process->creation_time.tv_sec,
+      process->creation_time.tv_nsec,
+      process->insertion_time.tv_sec,
+      process->insertion_time.tv_nsec,
+      g_quark_to_string(process->name),
       g_quark_to_string(process->brand),
       process->cpu);
 
   for(i = 0 ; i < process->execution_stack->len; i++) {
     es = &g_array_index(process->execution_stack, LttvExecutionState, i);
     fprintf(fp, "    <ES MODE=\"%s\" SUBMODE=\"%s\" ENTRY_S=%lu ENTRY_NS=%lu",
-           g_quark_to_string(es->t), g_quark_to_string(es->n),
+      g_quark_to_string(es->t), g_quark_to_string(es->n),
             es->entry.tv_sec, es->entry.tv_nsec);
     fprintf(fp, " CHANGE_S=%lu CHANGE_NS=%lu STATUS=\"%s\"/>\n",
             es->change.tv_sec, es->change.tv_nsec, g_quark_to_string(es->s)); 
   }
+
+  for(i = 0 ; i < process->user_stack->len; i++) {
+    address = &g_array_index(process->user_stack, guint64, i);
+    fprintf(fp, "    <USER_STACK ADDRESS=\"%llu\"/>\n",
+            address);
+  }
+
+  if(process->usertrace) {
+    fprintf(fp, "    <USERTRACE NAME=\"%s\" CPU=%u\n/>",
+            g_quark_to_string(process->usertrace->tracefile_name),
+           process->usertrace->cpu);
+  }
+
+
   fprintf(fp, "  </PROCESS>\n");
 }
 
@@ -462,7 +482,7 @@ void lttv_state_write(LttvTraceState *self, LttTime t, FILE *fp)
   
   nb_cpus = ltt_trace_get_num_cpu(self->parent.t);
   for(i=0;i<nb_cpus;i++) {
-    fprintf(fp,"<CPU NUM=%u RUNNING_PROCESS=%u>\n",
+    fprintf(fp,"  <CPU NUM=%u RUNNING_PROCESS=%u>\n",
         i, self->running_process[i]->pid);
   }
 
@@ -485,9 +505,375 @@ void lttv_state_write(LttvTraceState *self, LttTime t, FILE *fp)
     }
   }
   g_free(ep);
-  fprintf(fp,"</PROCESS_STATE>");
+  fprintf(fp,"</PROCESS_STATE>\n");
+}
+
+
+static void write_process_state_raw(gpointer key, gpointer value,
+    gpointer user_data)
+{
+  LttvProcessState *process;
+
+  LttvExecutionState *es;
+
+  FILE *fp = (FILE *)user_data;
+
+  guint i;
+  guint64 address;
+
+  process = (LttvProcessState *)value;
+  fputc(HDR_PROCESS, fp);
+  //fwrite(&header, sizeof(header), 1, fp);
+  //fprintf(fp, "%s", g_quark_to_string(process->type));
+  //fputc('\0', fp);
+  fwrite(&process->type, sizeof(process->type), 1, fp);
+  //fprintf(fp, "%s", g_quark_to_string(process->name));
+  //fputc('\0', fp);
+  fwrite(&process->name, sizeof(process->name), 1, fp);
+  //fprintf(fp, "%s", g_quark_to_string(process->brand));
+  //fputc('\0', fp);
+  fwrite(&process->brand, sizeof(process->brand), 1, fp);
+  fwrite(&process->pid, sizeof(process->pid), 1, fp);
+  fwrite(&process->tgid, sizeof(process->tgid), 1, fp);
+  fwrite(&process->ppid, sizeof(process->ppid), 1, fp);
+  fwrite(&process->cpu, sizeof(process->cpu), 1, fp);
+  fwrite(&process->creation_time, sizeof(process->creation_time), 1, fp);
+  fwrite(&process->insertion_time, sizeof(process->insertion_time), 1, fp);
+
+#if 0
+  fprintf(fp,
+"  <PROCESS CORE=%p PID=%u TGID=%u PPID=%u TYPE=\"%s\" CTIME_S=%lu CTIME_NS=%lu ITIME_S=%lu ITIME_NS=%lu NAME=\"%s\" BRAND=\"%s\" CPU=\"%u\" PROCESS_TYPE=%u>\n",
+      process, process->pid, process->tgid, process->ppid,
+      g_quark_to_string(process->type),
+      process->creation_time.tv_sec,
+      process->creation_time.tv_nsec,
+      process->insertion_time.tv_sec,
+      process->insertion_time.tv_nsec,
+      g_quark_to_string(process->name),
+      g_quark_to_string(process->brand),
+      process->cpu);
+#endif //0
+
+  for(i = 0 ; i < process->execution_stack->len; i++) {
+    es = &g_array_index(process->execution_stack, LttvExecutionState, i);
+
+    fputc(HDR_ES, fp);
+    //fprintf(fp, "%s", g_quark_to_string(es->t));
+    //fputc('\0', fp);
+    fwrite(&es->t, sizeof(es->t), 1, fp);
+    //fprintf(fp, "%s", g_quark_to_string(es->n));
+    //fputc('\0', fp);
+    fwrite(&es->n, sizeof(es->n), 1, fp);
+    //fprintf(fp, "%s", g_quark_to_string(es->s));
+    //fputc('\0', fp);
+    fwrite(&es->s, sizeof(es->s), 1, fp);
+    fwrite(&es->entry, sizeof(es->entry), 1, fp);
+    fwrite(&es->change, sizeof(es->change), 1, fp);
+#if 0
+    fprintf(fp, "    <ES MODE=\"%s\" SUBMODE=\"%s\" ENTRY_S=%lu ENTRY_NS=%lu",
+      g_quark_to_string(es->t), g_quark_to_string(es->n),
+            es->entry.tv_sec, es->entry.tv_nsec);
+    fprintf(fp, " CHANGE_S=%lu CHANGE_NS=%lu STATUS=\"%s\"/>\n",
+            es->change.tv_sec, es->change.tv_nsec, g_quark_to_string(es->s)); 
+#endif //0
+  }
+
+  for(i = 0 ; i < process->user_stack->len; i++) {
+    address = &g_array_index(process->user_stack, guint64, i);
+    fputc(HDR_USER_STACK, fp);
+    fwrite(&address, sizeof(address), 1, fp);
+#if 0
+    fprintf(fp, "    <USER_STACK ADDRESS=\"%llu\"/>\n",
+            address);
+#endif //0
+  }
+
+  if(process->usertrace) {
+    fputc(HDR_USERTRACE, fp);
+    //fprintf(fp, "%s", g_quark_to_string(process->usertrace->tracefile_name));
+    //fputc('\0', fp);
+    fwrite(&process->usertrace->tracefile_name,
+                   sizeof(process->usertrace->tracefile_name), 1, fp);
+    fwrite(&process->usertrace->cpu, sizeof(process->usertrace->cpu), 1, fp);
+#if 0
+    fprintf(fp, "    <USERTRACE NAME=\"%s\" CPU=%u\n/>",
+            g_quark_to_string(process->usertrace->tracefile_name),
+           process->usertrace->cpu);
+#endif //0
+  }
+
+}
+
+
+void lttv_state_write_raw(LttvTraceState *self, LttTime t, FILE *fp)
+{
+  guint i, nb_tracefile, nb_block, offset;
+  guint64 tsc;
+
+  LttvTracefileState *tfcs;
+
+  LttTracefile *tf;
+
+  LttEventPosition *ep;
+
+  guint nb_cpus;
+
+  ep = ltt_event_position_new();
+
+  //fprintf(fp,"<PROCESS_STATE TIME_S=%lu TIME_NS=%lu>\n", t.tv_sec, t.tv_nsec);
+  fputc(HDR_PROCESS_STATE, fp);
+  fwrite(&t, sizeof(t), 1, fp);
+
+  g_hash_table_foreach(self->processes, write_process_state_raw, fp);
+  
+  nb_cpus = ltt_trace_get_num_cpu(self->parent.t);
+  for(i=0;i<nb_cpus;i++) {
+    fputc(HDR_CPU, fp);
+    fwrite(&i, sizeof(i), 1, fp); /* cpu number */
+    fwrite(&self->running_process[i]->pid,
+        sizeof(self->running_process[i]->pid), 1, fp);
+    //fprintf(fp,"  <CPU NUM=%u RUNNING_PROCESS=%u>\n",
+    //    i, self->running_process[i]->pid);
+  }
+
+  nb_tracefile = self->parent.tracefiles->len;
+
+  for(i = 0 ; i < nb_tracefile ; i++) {
+    tfcs = 
+          LTTV_TRACEFILE_STATE(g_array_index(self->parent.tracefiles,
+                                          LttvTracefileContext*, i));
+  //  fprintf(fp, "  <TRACEFILE TIMESTAMP_S=%lu TIMESTAMP_NS=%lu", 
+  //      tfcs->parent.timestamp.tv_sec, 
+  //      tfcs->parent.timestamp.tv_nsec);
+    fputc(HDR_TRACEFILE, fp);
+    fwrite(&tfcs->parent.timestamp, sizeof(tfcs->parent.timestamp), 1, fp);
+    /* Note : if timestamp if LTT_TIME_INFINITE, there will be no
+     * position following : end of trace */
+    LttEvent *e = ltt_tracefile_get_event(tfcs->parent.tf);
+    if(e != NULL) {
+      ltt_event_position(e, ep);
+      ltt_event_position_get(ep, &tf, &nb_block, &offset, &tsc);
+      //fprintf(fp, " BLOCK=%u OFFSET=%u TSC=%llu/>\n", nb_block, offset,
+      //    tsc);
+      fwrite(&nb_block, sizeof(nb_block), 1, fp);
+      fwrite(&offset, sizeof(offset), 1, fp);
+      fwrite(&tsc, sizeof(tsc), 1, fp);
+    }
+  }
+  g_free(ep);
+}
+
+
+/* Read process state from a file */
+
+/* Called because a HDR_PROCESS was found */
+static void read_process_state_raw(LttvTraceState *self, FILE *fp)
+{
+  LttvExecutionState *es;
+  LttvProcessState *process, *parent_process;
+  LttvProcessState tmp;
+
+  FILE *fp = (FILE *)user_data;
+
+  guint i;
+  guint64 address;
+  guint cpu;
+
+  /* TOOD : check return value */
+  fread(&tmp.type, sizeof(tmp.type), 1, fp);
+  fread(&tmp.name, sizeof(tmp.name), 1, fp);
+  fread(&tmp.brand, sizeof(tmp.brand), 1, fp);
+  fread(&tmp.pid, sizeof(tmp.pid), 1, fp);
+  fread(&tmp.tgid, sizeof(tmp.tgid), 1, fp);
+  fread(&tmp.ppid, sizeof(tmp.ppid), 1, fp);
+  fread(&tmp.cpu, sizeof(tmp.cpu), 1, fp);
+  fread(&tmp.creation_time, sizeof(tmp.creation_time), 1, fp);
+  fread(&tmp.insertion_time, sizeof(tmp.insertion_time), 1, fp);
+
+  if(tmp.pid == 0) {
+    process = lttv_state_find_process(self, tmp.cpu, tmp.pid,
+        tmp.insertion_time);
+  } else {
+    /* We must link to the parent */
+    parent_process = lttv_state_find_process_or_create(self, ANY_CPU, tmp.ppid,
+        LTT_TIME_ZERO);
+    process = lttv_state_find_process_or_create(self, ANY_CPU, tmp.pid,
+        tmp.insertion_time);
+  }
+  process->creation_time = tmp.creation_time;
+  process->type = tmp.type;
+  process->brand = tmp.brand;
+  process->tgid = tmp.tgid;
+  process->cpu = tmp.cpu;
+
+  do {
+    if(feof(fp) || ferror(fp)) goto end_loop;
+
+    hdr = fgetc(fp);
+
+    switch(hdr) {
+      case HDR_ES:
+        break;
+      case HDR_USER_STACK:
+        break;
+      case HDR_USERTRACE:
+        break;
+      case HDR_PROCESS_STATE:
+        break;
+      default:
+        ungetc(hdr, fp);
+        goto end_loop;
+    };
+  } while(1);
+end_loop:
+
+}
+
+
+/* Called because a HDR_PROCESS_STATE was found */
+/* Append a saved state to the trace states */
+void lttv_state_read_raw(LttvTraceState *self, FILE *fp)
+{
+  guint i, nb_tracefile, nb_block, offset;
+  guint64 tsc;
+  LttTracefile *tf;
+
+  LttEventPosition *ep;
+
+  guint nb_cpus;
+
+  int hdr;
+
+  LttTime t;
+
+  LttvAttribute *saved_states_tree, *saved_state_tree;
+
+  LttvAttributeValue value;
+  ep = ltt_event_position_new();
+  
+  restore_init_state(self);
+
+  fread(&t, sizeof(t), 1, fp);
+
+  do {
+    if(feof(fp) || ferror(fp)) goto end_loop;
+    hdr = fgetc(fp);
+
+    switch(hdr) {
+      case HDR_PROCESS:
+        /* Call read_process_state_raw */
+        read_process_state_raw(self, fp);
+        break;
+      case HDR_TRACEFILE:
+      case HDR_TRACESET:
+      case HDR_TRACE:
+      case HDR_QUARKS:
+      case HDR_QUARK:
+      case HDR_ES:
+      case HDR_USER_STACK:
+      case HDR_USERTRACE:
+      case HDR_PROCESS_STATE:
+      case HDR_CPU:
+        g_error("Error while parsing saved state file :"
+            " unexpected data header %d",
+            hdr);
+        break;
+      default:
+        g_error("Error while parsing saved state file : unknown data header %d",
+            hdr);
+    };
+  } while(1);
+end_loop:
+
+  nb_cpus = ltt_trace_get_num_cpu(self->parent.t);
+  for(i=0;i<nb_cpus;i++) {
+    int cpu_num;
+    hdr = fgetc(fp);
+    g_assert(hdr == HDR_CPU);
+    fread(&cpu_num, sizeof(cpu_num), 1, fp); /* cpu number */
+    g_assert(i == cpu_num);
+    fread(&self->running_process[i]->pid,
+        sizeof(self->running_process[i]->pid), 1, fp);
+  }
+
+  nb_tracefile = self->parent.tracefiles->len;
+
+  for(i = 0 ; i < nb_tracefile ; i++) {
+    tfcs = 
+          LTTV_TRACEFILE_STATE(g_array_index(self->parent.tracefiles,
+                                          LttvTracefileContext*, i));
+  //  fprintf(fp, "  <TRACEFILE TIMESTAMP_S=%lu TIMESTAMP_NS=%lu", 
+  //      tfcs->parent.timestamp.tv_sec, 
+  //      tfcs->parent.timestamp.tv_nsec);
+    hdr = fgetc(fp);
+    g_assert(hdr == HDR_TRACEFILE);
+    fread(&tfcs->parent.timestamp, sizeof(tfcs->parent.timestamp), 1, fp);
+    /* Note : if timestamp if LTT_TIME_INFINITE, there will be no
+     * position following : end of trace */
+    if(ltt_time_compare(tfcs->parent.timestamp, LTT_TIME_INFINITE) != 0) {
+      fread(&nb_block, sizeof(nb_block), 1, fp);
+      fread(&offset, sizeof(offset), 1, fp);
+      fread(&tsc, sizeof(tsc), 1, fp);
+      ltt_event_position_set(ep, tf, nb_block, offset, tsc);
+      g_assert(ltt_tracefile_seek_position(tfc->tf, ep) == 0);
+    }
+  }
+  g_free(ep);
+
+  saved_states_tree = lttv_attribute_find_subdir(tcs->parent.t_a, 
+      LTTV_STATE_SAVED_STATES);
+  saved_state_tree = g_object_new(LTTV_ATTRIBUTE_TYPE, NULL);
+  value = lttv_attribute_add(saved_states_tree, 
+      lttv_attribute_get_number(saved_states_tree), LTTV_GOBJECT);
+  *(value.v_gobject) = (GObject *)saved_state_tree;
+  value = lttv_attribute_add(saved_state_tree, LTTV_STATE_TIME, LTTV_TIME);
+  *(value.v_time) = t;
+  lttv_state_save(tcs, saved_state_tree);
+  g_debug("Saving state at time %lu.%lu", t.tv_sec,
+    self->parent.timestamp.tv_nsec);
+
+  *(self->max_time_state_recomputed_in_seek) = t;
 }
 
+/* Called when a HDR_TRACE is found */
+void lttv_trace_states_read_raw(LttvTraceState *tcs, FILE *fp)
+{
+  int hdr;
+
+  do {
+    if(feof(fp) || ferror(fp)) goto end_loop;
+    hdr = fgetc(fp);
+
+    switch(hdr) {
+      case HDR_PROCESS_STATE:
+        /* Call read_process_state_raw */
+        lttv_state_read_raw(tcs, fp);
+        break;
+      case HDR_TRACEFILE:
+      case HDR_TRACESET:
+      case HDR_TRACE:
+      case HDR_QUARKS:
+      case HDR_QUARK:
+      case HDR_ES:
+      case HDR_USER_STACK:
+      case HDR_USERTRACE:
+      case HDR_PROCESS:
+      case HDR_CPU:
+        g_error("Error while parsing saved state file :"
+            " unexpected data header %d",
+            hdr);
+        break;
+      default:
+        g_error("Error while parsing saved state file : unknown data header %d",
+            hdr);
+    };
+  } while(1);
+end_loop:
+
+  *(tcs->max_time_state_recomputed_in_seek) = tcs->parent.time_span.end_time;
+}
+
+
 
 /* Copy each process from an existing hash table to a new one */
 
@@ -635,7 +1021,7 @@ static void state_restore(LttvTraceState *self, LttvAttribute *container)
 
   LttvAttributeName name;
 
-       gboolean is_named;
+  gboolean is_named;
 
   LttEventPosition *ep;
 
@@ -721,7 +1107,7 @@ static void state_saved_free(LttvTraceState *self, LttvAttribute *container)
 
   LttvAttributeName name;
 
-       gboolean is_named;
+  gboolean is_named;
 
   LttEventPosition *ep;
 
@@ -774,7 +1160,7 @@ static void free_saved_state(LttvTraceState *self)
 
   LttvAttributeName name;
 
-       gboolean is_named;
+  gboolean is_named;
 
   LttvAttribute *saved_states;
 
@@ -881,88 +1267,88 @@ create_name_tables(LttvTraceState *tcs)
       LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_SYSCALL_ENTRY,
       LTT_FIELD_SYSCALL_ID, 0, 0,
       NULL, NULL, &h)) {
-               
-               thf = lttv_trace_hook_get_first(&h);
-               
-               t = ltt_field_type(thf->f1);
-               nb = ltt_type_element_number(t);
-               
-               lttv_trace_hook_destroy(&h);
-
-               name_tables->syscall_names = g_new(GQuark, nb);
-               name_tables->nb_syscalls = nb;
-
-               for(i = 0 ; i < nb ; i++) {
-                       name_tables->syscall_names[i] = ltt_enum_string_get(t, i);
-               }
-
-               //name_tables->syscall_names = g_new(GQuark, 256);
-               //for(i = 0 ; i < 256 ; i++) {
-               //  g_string_printf(fe_name, "syscall %d", i);
-               //  name_tables->syscall_names[i] = g_quark_from_string(fe_name->str);
-               //}
-       } else {
-               name_tables->syscall_names = NULL;
-               name_tables->nb_syscalls = 0;
-       }
+    
+    thf = lttv_trace_hook_get_first(&h);
+    
+    t = ltt_field_type(thf->f1);
+    nb = ltt_type_element_number(t);
+    
+    lttv_trace_hook_destroy(&h);
+
+    name_tables->syscall_names = g_new(GQuark, nb);
+    name_tables->nb_syscalls = nb;
+
+    for(i = 0 ; i < nb ; i++) {
+      name_tables->syscall_names[i] = ltt_enum_string_get(t, i);
+    }
+
+    //name_tables->syscall_names = g_new(GQuark, 256);
+    //for(i = 0 ; i < 256 ; i++) {
+    //  g_string_printf(fe_name, "syscall %d", i);
+    //  name_tables->syscall_names[i] = g_quark_from_string(fe_name->str);
+    //}
+  } else {
+    name_tables->syscall_names = NULL;
+    name_tables->nb_syscalls = 0;
+  }
 
   if(!lttv_trace_find_hook(tcs->parent.t, LTT_FACILITY_KERNEL,
         LTT_EVENT_TRAP_ENTRY,
         LTT_FIELD_TRAP_ID, 0, 0,
         NULL, NULL, &h)) {
 
-               thf = lttv_trace_hook_get_first(&h);
-
-               t = ltt_field_type(thf->f1);
-               //nb = ltt_type_element_number(t);
-
-               lttv_trace_hook_destroy(&h);
-
-               /*
-               name_tables->trap_names = g_new(GQuark, nb);
-               for(i = 0 ; i < nb ; i++) {
-                       name_tables->trap_names[i] = g_quark_from_string(
-                                       ltt_enum_string_get(t, i));
-               }
-               */
-               name_tables->nb_traps = 256;
-               name_tables->trap_names = g_new(GQuark, 256);
-               for(i = 0 ; i < 256 ; i++) {
-                       g_string_printf(fe_name, "trap %d", i);
-                       name_tables->trap_names[i] = g_quark_from_string(fe_name->str);
-               }
-       } else {
-               name_tables->trap_names = NULL;
-               name_tables->nb_traps = 0;
-       }
+    thf = lttv_trace_hook_get_first(&h);
+
+    t = ltt_field_type(thf->f1);
+    //nb = ltt_type_element_number(t);
+
+    lttv_trace_hook_destroy(&h);
+
+    /*
+    name_tables->trap_names = g_new(GQuark, nb);
+    for(i = 0 ; i < nb ; i++) {
+      name_tables->trap_names[i] = g_quark_from_string(
+          ltt_enum_string_get(t, i));
+    }
+    */
+    name_tables->nb_traps = 256;
+    name_tables->trap_names = g_new(GQuark, 256);
+    for(i = 0 ; i < 256 ; i++) {
+      g_string_printf(fe_name, "trap %d", i);
+      name_tables->trap_names[i] = g_quark_from_string(fe_name->str);
+    }
+  } else {
+    name_tables->trap_names = NULL;
+    name_tables->nb_traps = 0;
+  }
 
   if(!lttv_trace_find_hook(tcs->parent.t,
         LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_ENTRY,
         LTT_FIELD_IRQ_ID, 0, 0,
         NULL, NULL, &h)) {
-               
-               thf = lttv_trace_hook_get_first(&h);
-               
-               t = ltt_field_type(thf->f1);
-               //nb = ltt_type_element_number(t);
-
-               lttv_trace_hook_destroy(&h);
-
-               /*
-               name_tables->irq_names = g_new(GQuark, nb);
-               for(i = 0 ; i < nb ; i++) {
-                       name_tables->irq_names[i] = g_quark_from_string(ltt_enum_string_get(t, i));
-               }
-               */
-
-               name_tables->irq_names = g_new(GQuark, 256);
-               for(i = 0 ; i < 256 ; i++) {
-                       g_string_printf(fe_name, "irq %d", i);
-                       name_tables->irq_names[i] = g_quark_from_string(fe_name->str);
-               }
-       } else {
-               name_tables->irq_names = NULL;
-       }
+    
+    thf = lttv_trace_hook_get_first(&h);
+    
+    t = ltt_field_type(thf->f1);
+    //nb = ltt_type_element_number(t);
+
+    lttv_trace_hook_destroy(&h);
+
+    /*
+    name_tables->irq_names = g_new(GQuark, nb);
+    for(i = 0 ; i < nb ; i++) {
+      name_tables->irq_names[i] = g_quark_from_string(ltt_enum_string_get(t, i));
+    }
+    */
+
+    name_tables->irq_names = g_new(GQuark, 256);
+    for(i = 0 ; i < 256 ; i++) {
+      g_string_printf(fe_name, "irq %d", i);
+      name_tables->irq_names[i] = g_quark_from_string(fe_name->str);
+    }
+  } else {
+    name_tables->irq_names = NULL;
+  }
   /*
   name_tables->soft_irq_names = g_new(GQuark, nb);
   for(i = 0 ; i < nb ; i++) {
@@ -1066,7 +1452,7 @@ static void push_state(LttvTracefileState *tfs, LttvExecutionMode t,
   es->t = t;
   es->n = state_id;
   es->entry = es->change = tfs->parent.timestamp;
-       es->cum_cpu_time = ltt_time_zero;
+  es->cum_cpu_time = ltt_time_zero;
   es->s = process->state->s;
   process->state = es;
 }
@@ -1074,9 +1460,9 @@ static void push_state(LttvTracefileState *tfs, LttvExecutionMode t,
 /* pop state
  * return 1 when empty, else 0 */
 int lttv_state_pop_state_cleanup(LttvProcessState *process, 
-               LttvTracefileState *tfs)
+    LttvTracefileState *tfs)
 { 
-       guint cpu = tfs->cpu;
+  guint cpu = tfs->cpu;
   LttvTraceState *ts = (LttvTraceState*)tfs->parent.t_context;
 
   guint depth = process->execution_stack->len;
@@ -1090,8 +1476,8 @@ int lttv_state_pop_state_cleanup(LttvProcessState *process,
   process->state = &g_array_index(process->execution_stack, LttvExecutionState,
       depth - 2);
   process->state->change = tfs->parent.timestamp;
-       
-       return 0;
+  
+  return 0;
 }
 
 static void pop_state(LttvTracefileState *tfs, LttvExecutionMode t)
@@ -1106,14 +1492,14 @@ static void pop_state(LttvTracefileState *tfs, LttvExecutionMode t)
     g_info("Different execution mode type (%lu.%09lu): ignore it\n",
         tfs->parent.timestamp.tv_sec, tfs->parent.timestamp.tv_nsec);
     g_info("process state has %s when pop_int is %s\n",
-                   g_quark_to_string(process->state->t),
-                   g_quark_to_string(t));
+        g_quark_to_string(process->state->t),
+        g_quark_to_string(t));
     g_info("{ %u, %u, %s, %s, %s }\n",
-                   process->pid,
-                   process->ppid,
-                   g_quark_to_string(process->name),
-                   g_quark_to_string(process->brand),
-                   g_quark_to_string(process->state->s));
+        process->pid,
+        process->ppid,
+        g_quark_to_string(process->name),
+        g_quark_to_string(process->brand),
+        g_quark_to_string(process->state->s));
     return;
   }
 
@@ -1131,60 +1517,60 @@ static void pop_state(LttvTracefileState *tfs, LttvExecutionMode t)
 }
 
 struct search_result {
-       const LttTime *time;    /* Requested time */
-       LttTime *best;  /* Best result */
+  const LttTime *time;  /* Requested time */
+  LttTime *best;  /* Best result */
 };
 
 static gint search_usertrace(gconstpointer a, gconstpointer b)
 {
-       const LttTime *elem_time = (const LttTime*)a;
-       /* Explicit non const cast */
-       struct search_result *res = (struct search_result *)b;
-
-       if(ltt_time_compare(*elem_time, *(res->time)) < 0) {
-               /* The usertrace was created before the schedchange */
-               /* Get larger keys */
-               return 1;
-       } else if(ltt_time_compare(*elem_time, *(res->time)) >= 0) {
-               /* The usertrace was created after the schedchange time */
-               /* Get smaller keys */
-               if(res->best) {
-                       if(ltt_time_compare(*elem_time, *res->best) < 0) {
-                               res->best = elem_time;
-                       }
-               } else {
-                       res->best = elem_time;
-               }
-               return -1;
-       }
-       return 0;
+  const LttTime *elem_time = (const LttTime*)a;
+  /* Explicit non const cast */
+  struct search_result *res = (struct search_result *)b;
+
+  if(ltt_time_compare(*elem_time, *(res->time)) < 0) {
+    /* The usertrace was created before the schedchange */
+    /* Get larger keys */
+    return 1;
+  } else if(ltt_time_compare(*elem_time, *(res->time)) >= 0) {
+    /* The usertrace was created after the schedchange time */
+    /* Get smaller keys */
+    if(res->best) {
+      if(ltt_time_compare(*elem_time, *res->best) < 0) {
+        res->best = elem_time;
+      }
+    } else {
+      res->best = elem_time;
+    }
+    return -1;
+  }
+  return 0;
 }
 
 static LttvTracefileState *ltt_state_usertrace_find(LttvTraceState *tcs,
-               guint pid, const LttTime *timestamp)
-{
-       LttvTracefileState *tfs = NULL;
-       struct search_result res;
-       /* Find the usertrace associated with a pid and time interval.
-        * Search in the usertraces by PID (within a hash) and then, for each
-        * corresponding element of the array, find the first one with creation
-        * timestamp the lowest, but higher or equal to "timestamp". */
-       res.time = timestamp;
-       res.best = NULL;
-       GTree *usertrace_tree = g_hash_table_lookup(tcs->usertraces, (gpointer)pid);
-       if(usertrace_tree) {
-               g_tree_search(usertrace_tree, search_usertrace, &res);
-               if(res.best)
-                       tfs = g_tree_lookup(usertrace_tree, res.best);
-       }
+    guint pid, const LttTime *timestamp)
+{
+  LttvTracefileState *tfs = NULL;
+  struct search_result res;
+  /* Find the usertrace associated with a pid and time interval.
+   * Search in the usertraces by PID (within a hash) and then, for each
+   * corresponding element of the array, find the first one with creation
+   * timestamp the lowest, but higher or equal to "timestamp". */
+  res.time = timestamp;
+  res.best = NULL;
+  GTree *usertrace_tree = g_hash_table_lookup(tcs->usertraces, (gpointer)pid);
+  if(usertrace_tree) {
+    g_tree_search(usertrace_tree, search_usertrace, &res);
+    if(res.best)
+      tfs = g_tree_lookup(usertrace_tree, res.best);
+  }
 
-       return tfs;
+  return tfs;
 }
 
 
 LttvProcessState *
 lttv_state_create_process(LttvTraceState *tcs, LttvProcessState *parent, 
-    guint cpu, guint pid, GQuark name, const LttTime *timestamp)
+    guint cpu, guint pid, guint tgid, GQuark name, const LttTime *timestamp)
 {
   LttvProcessState *process = g_new(LttvProcessState, 1);
 
@@ -1195,14 +1581,15 @@ lttv_state_create_process(LttvTraceState *tcs, LttvProcessState *parent,
   char buffer[128];
 
   process->pid = pid;
+  process->tgid = tgid;
   process->cpu = cpu;
   process->name = name;
   process->brand = LTTV_STATE_UNBRANDED;
   //process->last_cpu = tfs->cpu_name;
   //process->last_cpu_index = ltt_tracefile_num(((LttvTracefileContext*)tfs)->tf);
-       process->type = LTTV_STATE_USER_THREAD;
-       process->usertrace = ltt_state_usertrace_find(tcs, pid, timestamp);
-       process->current_function = 0; //function 0x0 by default.
+  process->type = LTTV_STATE_USER_THREAD;
+  process->usertrace = ltt_state_usertrace_find(tcs, pid, timestamp);
+  process->current_function = 0; //function 0x0 by default.
 
   g_info("Process %u, core %p", process->pid, process);
   g_hash_table_insert(tcs->processes, process, process);
@@ -1223,7 +1610,7 @@ lttv_state_create_process(LttvTraceState *tcs, LttvProcessState *parent,
 
   process->insertion_time = *timestamp;
   sprintf(buffer,"%d-%lu.%lu",pid, process->creation_time.tv_sec, 
-         process->creation_time.tv_nsec);
+    process->creation_time.tv_nsec);
   process->pid_time = g_quark_from_string(buffer);
   process->cpu = cpu;
   //process->last_cpu = tfs->cpu_name;
@@ -1238,7 +1625,7 @@ lttv_state_create_process(LttvTraceState *tcs, LttvProcessState *parent,
   es->entry = *timestamp;
   //g_assert(timestamp->tv_sec != 0);
   es->change = *timestamp;
-       es->cum_cpu_time = ltt_time_zero;
+  es->cum_cpu_time = ltt_time_zero;
   es->s = LTTV_STATE_RUN;
 
   es = process->state = &g_array_index(process->execution_stack, 
@@ -1248,13 +1635,13 @@ lttv_state_create_process(LttvTraceState *tcs, LttvProcessState *parent,
   es->entry = *timestamp;
   //g_assert(timestamp->tv_sec != 0);
   es->change = *timestamp;
-       es->cum_cpu_time = ltt_time_zero;
+  es->cum_cpu_time = ltt_time_zero;
   es->s = LTTV_STATE_WAIT_FORK;
-       
-       /* Allocate an empty function call stack. If it's empty, use 0x0. */
-       process->user_stack = g_array_sized_new(FALSE, FALSE,
-                       sizeof(guint64), 0);
-       
+  
+  /* Allocate an empty function call stack. If it's empty, use 0x0. */
+  process->user_stack = g_array_sized_new(FALSE, FALSE,
+      sizeof(guint64), 0);
+  
   return process;
 }
 
@@ -1279,13 +1666,13 @@ lttv_state_find_process_or_create(LttvTraceState *ts, guint cpu, guint pid,
   
   /* Put ltt_time_zero creation time for unexisting processes */
   if(unlikely(process == NULL)) {
-               process = lttv_state_create_process(ts,
-                NULL, cpu, pid, LTTV_STATE_UNNAMED, timestamp);
-               /* We are not sure is it's a kernel thread or normal thread, put the
-                * bottom stack state to unknown */
-               es = &g_array_index(process->execution_stack, LttvExecutionState, 0);
-               es->t = LTTV_STATE_MODE_UNKNOWN;
-       }
+    process = lttv_state_create_process(ts,
+                NULL, cpu, pid, 0, LTTV_STATE_UNNAMED, timestamp);
+    /* We are not sure is it's a kernel thread or normal thread, put the
+      * bottom stack state to unknown */
+    es = &g_array_index(process->execution_stack, LttvExecutionState, 0);
+    es->t = LTTV_STATE_MODE_UNKNOWN;
+  }
   return process;
 }
 
@@ -1334,19 +1721,19 @@ static gboolean syscall_entry(void *hook_data, void *call_data)
 
   LttvExecutionSubmode submode;
 
-       guint nb_syscalls = ((LttvTraceState *)(s->parent.t_context))->nb_syscalls;
-       guint syscall = ltt_event_get_unsigned(e, f);
-       
-       if(syscall < nb_syscalls) {
-         submode = ((LttvTraceState *)(s->parent.t_context))->syscall_names[
-           syscall];
-       } else {
-               /* Fixup an incomplete syscall table */
-               GString *string = g_string_new("");
+  guint nb_syscalls = ((LttvTraceState *)(s->parent.t_context))->nb_syscalls;
+  guint syscall = ltt_event_get_unsigned(e, f);
+  
+  if(syscall < nb_syscalls) {
+    submode = ((LttvTraceState *)(s->parent.t_context))->syscall_names[
+        syscall];
+  } else {
+    /* Fixup an incomplete syscall table */
+    GString *string = g_string_new("");
     g_string_printf(string, "syscall %u", syscall);
-               submode = g_quark_from_string(string->str);
-               g_string_free(string, TRUE);
-       }
+    submode = g_quark_from_string(string->str);
+    g_string_free(string, TRUE);
+  }
   push_state(s, LTTV_STATE_SYSCALL, submode);
   return FALSE;
 }
@@ -1378,7 +1765,7 @@ static gboolean trap_entry(void *hook_data, void *call_data)
   } else {
     /* Fixup an incomplete trap table */
     GString *string = g_string_new("");
-    g_string_printf(string, "trap %u", trap);
+    g_string_printf(string, "trap %llu", trap);
     submode = g_quark_from_string(string->str);
     g_string_free(string, TRUE);
   }
@@ -1473,7 +1860,7 @@ static void push_function(LttvTracefileState *tfs, guint64 funcptr)
     g_array_set_size(process->user_stack, depth + 1);
     
   new_func = &g_array_index(process->user_stack, guint64, depth);
-       *new_func = funcptr;
+  *new_func = funcptr;
   process->current_function = funcptr;
 }
 
@@ -1487,13 +1874,13 @@ static void pop_function(LttvTracefileState *tfs, guint64 funcptr)
     g_info("Different functions (%lu.%09lu): ignore it\n",
         tfs->parent.timestamp.tv_sec, tfs->parent.timestamp.tv_nsec);
     g_info("process state has %llu when pop_function is %llu\n",
-                   process->current_function, funcptr);
+        process->current_function, funcptr);
     g_info("{ %u, %u, %s, %s, %s }\n",
-                   process->pid,
-                   process->ppid,
-                   g_quark_to_string(process->name),
-                   g_quark_to_string(process->brand),
-                   g_quark_to_string(process->state->s));
+        process->pid,
+        process->ppid,
+        g_quark_to_string(process->name),
+        g_quark_to_string(process->brand),
+        g_quark_to_string(process->state->s));
     return;
   }
   guint depth = process->user_stack->len;
@@ -1507,7 +1894,7 @@ static void pop_function(LttvTracefileState *tfs, guint64 funcptr)
   process->user_stack = 
     g_array_set_size(process->user_stack, depth - 1);
   process->current_function =
-               g_array_index(process->user_stack, guint64, depth - 2);
+    g_array_index(process->user_stack, guint64, depth - 2);
 }
 
 
@@ -1520,7 +1907,7 @@ static gboolean function_entry(void *hook_data, void *call_data)
   LttvTraceHookByFacility *thf = (LttvTraceHookByFacility *)hook_data;
   g_assert(thf->f1 != NULL);
   LttField *f = thf->f1;
-       guint64 funcptr = ltt_event_get_long_unsigned(e, f);
+  guint64 funcptr = ltt_event_get_long_unsigned(e, f);
 
   push_function(s, funcptr);
   return FALSE;
@@ -1535,7 +1922,7 @@ static gboolean function_exit(void *hook_data, void *call_data)
   LttvTraceHookByFacility *thf = (LttvTraceHookByFacility *)hook_data;
   g_assert(thf->f1 != NULL);
   LttField *f = thf->f1;
-       guint64 funcptr = ltt_event_get_long_unsigned(e, f);
+  guint64 funcptr = ltt_event_get_long_unsigned(e, f);
 
   LttvExecutionSubmode submode;
 
@@ -1570,7 +1957,7 @@ static gboolean schedchange(void *hook_data, void *call_data)
 
     //This test only makes sense once the state is known and if there is no
     //missing events. We need to silently ignore schedchange coming after a
-               //process_free, or it causes glitches. (FIXME)
+    //process_free, or it causes glitches. (FIXME)
     //if(unlikely(process->pid != pid_out)) {
     //  g_assert(process->pid == 0);
     //}
@@ -1583,8 +1970,8 @@ static gboolean schedchange(void *hook_data, void *call_data)
       else process->state->s = LTTV_STATE_WAIT;
       process->state->change = s->parent.timestamp;
     }
-               
-               if(state_out == 32)
+    
+    if(state_out == 32)
        exit_process(s, process); /* EXIT_DEAD */
           /* see sched.h for states */
   }
@@ -1595,8 +1982,8 @@ static gboolean schedchange(void *hook_data, void *call_data)
                   &s->parent.timestamp);
   process->state->s = LTTV_STATE_RUN;
   process->cpu = cpu;
-       if(process->usertrace)
-               process->usertrace->cpu = cpu;
+  if(process->usertrace)
+    process->usertrace->cpu = cpu;
  // process->last_cpu_index = ltt_tracefile_num(((LttvTracefileContext*)s)->tf);
   process->state->change = s->parent.timestamp;
   return FALSE;
@@ -1608,7 +1995,8 @@ static gboolean process_fork(void *hook_data, void *call_data)
   LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
   LttvTraceHookByFacility *thf = (LttvTraceHookByFacility *)hook_data;
   guint parent_pid;
-  guint child_pid;
+  guint child_pid;  /* In the Linux Kernel, there is one PID per thread. */
+  guint child_tgid;  /* tgid in the Linux kernel is the "real" POSIX PID. */
   LttvProcessState *zombie_process;
   guint cpu = s->cpu;
   LttvTraceState *ts = (LttvTraceState*)s->parent.t_context;
@@ -1620,6 +2008,11 @@ static gboolean process_fork(void *hook_data, void *call_data)
 
   /* Child PID */
   child_pid = ltt_event_get_unsigned(e, thf->f2);
+  s->parent.target_pid = child_pid;
+
+  /* Child TGID */
+  if(thf->f3) child_tgid = ltt_event_get_unsigned(e, thf->f3);
+  else child_tgid = 0;
 
   /* Mathieu : it seems like the process might have been scheduled in before the
    * fork, and, in a rare case, might be the current process. This might happen
@@ -1648,7 +2041,8 @@ static gboolean process_fork(void *hook_data, void *call_data)
   child_process = lttv_state_find_process(ts, ANY_CPU, child_pid);
   if(child_process == NULL) {
     child_process = lttv_state_create_process(ts, process, cpu,
-                              child_pid, LTTV_STATE_UNNAMED, &s->parent.timestamp);
+                              child_pid, child_tgid, 
+                              LTTV_STATE_UNNAMED, &s->parent.timestamp);
   } else {
     /* The process has already been created :  due to time imprecision between
      * multiple CPUs : it has been scheduled in before creation. Note that we
@@ -1659,9 +2053,11 @@ static gboolean process_fork(void *hook_data, void *call_data)
     g_assert(0); /* This is a problematic case : the process has been created
                     before the fork event */
     child_process->ppid = process->pid;
+    child_process->tgid = child_tgid;
   }
-       g_assert(child_process->name == LTTV_STATE_UNNAMED);
-       child_process->name = process->name;
+  g_assert(child_process->name == LTTV_STATE_UNNAMED);
+  child_process->name = process->name;
+  child_process->brand = process->brand;
 
   return FALSE;
 }
@@ -1680,13 +2076,14 @@ static gboolean process_kernel_thread(void *hook_data, void *call_data)
 
   /* PID */
   pid = ltt_event_get_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);
-       es->t = LTTV_STATE_SYSCALL;
-       process->type = LTTV_STATE_KERNEL_THREAD;
+  es = &g_array_index(process->execution_stack, LttvExecutionState, 0);
+  es->t = LTTV_STATE_SYSCALL;
+  process->type = LTTV_STATE_KERNEL_THREAD;
 
-       return FALSE;
+  return FALSE;
 }
 
 static gboolean process_exit(void *hook_data, void *call_data)
@@ -1701,6 +2098,7 @@ static gboolean process_exit(void *hook_data, void *call_data)
   LttvProcessState *process; // = ts->running_process[cpu];
 
   pid = ltt_event_get_unsigned(e, thf->f1);
+  s->parent.target_pid = pid;
 
   // FIXME : Add this test in the "known state" section
   // g_assert(process->pid == pid);
@@ -1723,6 +2121,7 @@ static gboolean process_free(void *hook_data, void *call_data)
 
   /* PID of the process to release */
   release_pid = ltt_event_get_unsigned(e, thf->f1);
+  s->parent.target_pid = release_pid;
   
   g_assert(release_pid != 0);
 
@@ -1779,6 +2178,7 @@ static gboolean process_exec(void *hook_data, void *call_data)
   null_term_name[name_len] = '\0';
 
   process->name = g_quark_from_string(null_term_name);
+  process->brand = LTTV_STATE_UNBRANDED;
   g_free(null_term_name);
   return FALSE;
 }
@@ -1803,99 +2203,108 @@ static gboolean enum_process_state(void *hook_data, void *call_data)
 {
   LttvTracefileState *s = (LttvTracefileState *)call_data;
   LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
-       //It's slow : optimise later by doing this before reading trace.
-       LttEventType *et = ltt_event_eventtype(e);
-       //
+  //It's slow : optimise later by doing this before reading trace.
+  LttEventType *et = ltt_event_eventtype(e);
+  //
   LttvTraceHookByFacility *thf = (LttvTraceHookByFacility *)hook_data;
   guint parent_pid;
   guint pid;
+  guint tgid;
   gchar * command;
   guint cpu = s->cpu;
   LttvTraceState *ts = (LttvTraceState*)s->parent.t_context;
   LttvProcessState *process = ts->running_process[cpu];
   LttvProcessState *parent_process;
-       LttField *f4, *f5, *f6, *f7;
-       GQuark type, mode, submode, status;
-       LttvExecutionState *es;
+  LttField *f4, *f5, *f6, *f7, *f8;
+  GQuark type, mode, submode, status;
+  LttvExecutionState *es;
 
   /* PID */
   pid = ltt_event_get_unsigned(e, thf->f1);
-
+  s->parent.target_pid = pid;
+  
   /* Parent PID */
   parent_pid = ltt_event_get_unsigned(e, thf->f2);
 
   /* Command name */
   command = ltt_event_get_string(e, thf->f3);
 
-       /* type */
-       f4 = ltt_eventtype_field_by_name(et, LTT_FIELD_TYPE);
-       type = ltt_enum_string_get(ltt_field_type(f4),
-                       ltt_event_get_unsigned(e, f4));
-
-       /* mode */
-       f5 = ltt_eventtype_field_by_name(et, LTT_FIELD_MODE);
-       mode = ltt_enum_string_get(ltt_field_type(f5), 
-                       ltt_event_get_unsigned(e, f5));
-
-       /* submode */
-       f6 = ltt_eventtype_field_by_name(et, LTT_FIELD_SUBMODE);
-       submode = ltt_enum_string_get(ltt_field_type(f6), 
-                       ltt_event_get_unsigned(e, f6));
-
-       /* status */
-       f7 = ltt_eventtype_field_by_name(et, LTT_FIELD_STATUS);
-       status = ltt_enum_string_get(ltt_field_type(f7), 
-                       ltt_event_get_unsigned(e, f7));
-
-  /* The process might exist if a process was forked while performing the sate dump. */
+  /* type */
+  f4 = ltt_eventtype_field_by_name(et, LTT_FIELD_TYPE);
+  type = ltt_enum_string_get(ltt_field_type(f4),
+      ltt_event_get_unsigned(e, f4));
+
+  /* mode */
+  f5 = ltt_eventtype_field_by_name(et, LTT_FIELD_MODE);
+  mode = ltt_enum_string_get(ltt_field_type(f5), 
+      ltt_event_get_unsigned(e, f5));
+
+  /* submode */
+  f6 = ltt_eventtype_field_by_name(et, LTT_FIELD_SUBMODE);
+  submode = ltt_enum_string_get(ltt_field_type(f6), 
+      ltt_event_get_unsigned(e, f6));
+
+  /* status */
+  f7 = ltt_eventtype_field_by_name(et, LTT_FIELD_STATUS);
+  status = ltt_enum_string_get(ltt_field_type(f7), 
+      ltt_event_get_unsigned(e, f7));
+
+  /* TGID */
+  f8 = ltt_eventtype_field_by_name(et, LTT_FIELD_TGID);
+  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, 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 */
-                       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;
-                       es->s = status;
-                       es->n = submode;
-               } else {
-                       /* On top of it : */
-                       es = process->state = &g_array_index(process->execution_stack, 
-                                       LttvExecutionState, 1);
-                       es->t = LTTV_STATE_USER_MODE;
-                       es->s = status;
-                       es->n = submode;
-               }
+                              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 */
+      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;
+      es->s = status;
+      es->n = submode;
+    } else {
+      /* On top of it : */
+      es = process->state = &g_array_index(process->execution_stack, 
+          LttvExecutionState, 1);
+      es->t = LTTV_STATE_USER_MODE;
+      es->s = status;
+      es->n = submode;
+    }
 #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;
-               }
+    /* 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.
+     * 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->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. */
+    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;
@@ -1929,7 +2338,7 @@ void lttv_state_add_event_hooks(LttvTracesetState *self)
   LttvAttributeValue val;
 
   gint ret;
-       gint hn;
+  gint hn;
 
   nb_trace = lttv_traceset_number(traceset);
   for(i = 0 ; i < nb_trace ; i++) {
@@ -1940,117 +2349,117 @@ void lttv_state_add_event_hooks(LttvTracesetState *self)
 
     hooks = g_array_sized_new(FALSE, FALSE, sizeof(LttvTraceHook), 18);
     hooks = g_array_set_size(hooks, 18); // Max possible number of hooks.
-               hn = 0;
+    hn = 0;
 
     ret = lttv_trace_find_hook(ts->parent.t,
         LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_SYSCALL_ENTRY,
         LTT_FIELD_SYSCALL_ID, 0, 0,
         syscall_entry, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-               if(ret) hn--;
+    if(ret) hn--;
 
     ret = lttv_trace_find_hook(ts->parent.t,
         LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_SYSCALL_EXIT,
         0, 0, 0,
         syscall_exit, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-               if(ret) hn--;
+    if(ret) hn--;
 
     ret = lttv_trace_find_hook(ts->parent.t,
         LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_ENTRY,
         LTT_FIELD_TRAP_ID, 0, 0,
         trap_entry, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-               if(ret) hn--;
+    if(ret) hn--;
 
     ret = lttv_trace_find_hook(ts->parent.t,
         LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_EXIT,
         0, 0, 0, 
         trap_exit, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-               if(ret) hn--;
+    if(ret) hn--;
 
     ret = lttv_trace_find_hook(ts->parent.t,
         LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_ENTRY,
         LTT_FIELD_IRQ_ID, 0, 0,
         irq_entry, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-               if(ret) hn--;
+    if(ret) hn--;
 
     ret = lttv_trace_find_hook(ts->parent.t,
         LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_EXIT,
         0, 0, 0, 
         irq_exit, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-               if(ret) hn--;
+    if(ret) hn--;
 
     ret = lttv_trace_find_hook(ts->parent.t,
         LTT_FACILITY_KERNEL, LTT_EVENT_SOFT_IRQ_ENTRY,
         LTT_FIELD_SOFT_IRQ_ID, 0, 0,
         soft_irq_entry, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-               if(ret) hn--;
+    if(ret) hn--;
 
     ret = lttv_trace_find_hook(ts->parent.t,
         LTT_FACILITY_KERNEL, LTT_EVENT_SOFT_IRQ_EXIT,
         0, 0, 0, 
         soft_irq_exit, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-               if(ret) hn--;
+    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,
         schedchange, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-               if(ret) 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, 0,
+        LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID, LTT_FIELD_TGID,
         process_fork, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-               if(ret) hn--;
+    if(ret) hn--;
 
     ret = lttv_trace_find_hook(ts->parent.t,
         LTT_FACILITY_PROCESS, LTT_EVENT_KERNEL_THREAD,
         LTT_FIELD_PID, 0, 0,
         process_kernel_thread, NULL, &g_array_index(hooks, LttvTraceHook,
-                                       hn++));
-               if(ret) hn--;
+          hn++));
+    if(ret) hn--;
 
     ret = lttv_trace_find_hook(ts->parent.t,
         LTT_FACILITY_PROCESS, LTT_EVENT_EXIT,
         LTT_FIELD_PID, 0, 0,
         process_exit, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-               if(ret) hn--;
+    if(ret) hn--;
     
     ret = lttv_trace_find_hook(ts->parent.t,
         LTT_FACILITY_PROCESS, LTT_EVENT_FREE,
         LTT_FIELD_PID, 0, 0,
         process_free, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-               if(ret) hn--;
+    if(ret) hn--;
 
     ret = lttv_trace_find_hook(ts->parent.t,
         LTT_FACILITY_FS, LTT_EVENT_EXEC,
         LTT_FIELD_FILENAME, 0, 0,
         process_exec, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-               if(ret) hn--;
+    if(ret) hn--;
 
     ret = lttv_trace_find_hook(ts->parent.t,
         LTT_FACILITY_USER_GENERIC, LTT_EVENT_THREAD_BRAND,
         LTT_FIELD_NAME, 0, 0,
         thread_brand, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-               if(ret) hn--;
+    if(ret) hn--;
 
      /* statedump-related hooks */
     ret = lttv_trace_find_hook(ts->parent.t,
         LTT_FACILITY_STATEDUMP, LTT_EVENT_ENUM_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--;
+    if(ret) hn--;
 
     ret = lttv_trace_find_hook(ts->parent.t,
         LTT_FACILITY_USER_GENERIC, LTT_EVENT_FUNCTION_ENTRY,
         LTT_FIELD_THIS_FN, LTT_FIELD_CALL_SITE, 0,
         function_entry, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-               if(ret) hn--;
+    if(ret) hn--;
 
     ret = lttv_trace_find_hook(ts->parent.t,
         LTT_FACILITY_USER_GENERIC, LTT_EVENT_FUNCTION_EXIT,
         LTT_FIELD_THIS_FN, LTT_FIELD_CALL_SITE, 0,
         function_exit, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-               if(ret) hn--;
+    if(ret) hn--;
 
     hooks = g_array_set_size(hooks, hn);
   
@@ -2194,7 +2603,7 @@ static gboolean state_save_after_trace_hook(void *hook_data, void *call_data)
 
 guint lttv_state_current_cpu(LttvTracefileState *tfs)
 {
-       return tfs->cpu;
+  return tfs->cpu;
 }
 
 
@@ -2248,7 +2657,7 @@ static gboolean block_start(void *hook_data, void *call_data)
     lttv_state_save(tcs, saved_state_tree);
     tcs->nb_event = 0;
     g_debug("Saving state at time %lu.%lu", self->parent.timestamp.tv_sec,
-           self->parent.timestamp.tv_nsec);
+      self->parent.timestamp.tv_nsec);
   }
   *(tcs->max_time_state_recomputed_in_seek) = self->parent.timestamp;
   return FALSE;
@@ -2297,9 +2706,9 @@ void lttv_state_save_add_event_hooks(LttvTracesetState *self)
     ts = (LttvTraceState *)self->parent.traces[i];
 
     lttv_trace_find_hook(ts->parent.t, "core","block_start",NULL, 
-       NULL, NULL, block_start, &hook_start);
+  NULL, NULL, block_start, &hook_start);
     lttv_trace_find_hook(ts->parent.t, "core","block_end",NULL, 
-       NULL, NULL, block_end, &hook_end);
+  NULL, NULL, block_end, &hook_end);
 
     nb_tracefile = ts->parent.tracefiles->len;
 
@@ -2308,9 +2717,9 @@ void lttv_state_save_add_event_hooks(LttvTracesetState *self)
           LTTV_TRACEFILE_STATE(&g_array_index(ts->parent.tracefiles,
                                           LttvTracefileContext, j));
       lttv_hooks_add(lttv_hooks_by_id_find(tfs->parent.event_by_id, 
-               hook_start.id), hook_start.h, NULL, LTTV_PRIO_STATE);
+                hook_start.id), hook_start.h, NULL, LTTV_PRIO_STATE);
       lttv_hooks_add(lttv_hooks_by_id_find(tfs->parent.event_by_id, 
-                     hook_end.id), hook_end.h, NULL, LTTV_PRIO_STATE);
+                hook_end.id), hook_end.h, NULL, LTTV_PRIO_STATE);
     }
   }
 }
@@ -2381,10 +2790,10 @@ void lttv_state_save_remove_event_hooks(LttvTracesetState *self)
     ts = LTTV_TRACE_STATE(self->parent.traces[i]);
 
     lttv_trace_find_hook(ts->parent.t, "core","block_start",NULL, 
-       NULL, NULL, block_start, &hook_start);
+  NULL, NULL, block_start, &hook_start);
 
     lttv_trace_find_hook(ts->parent.t, "core","block_end",NULL, 
-       NULL, NULL, block_end, &hook_end);
+  NULL, NULL, block_end, &hook_end);
 
     nb_tracefile = ts->parent.tracefiles->len;
 
@@ -2470,7 +2879,7 @@ void lttv_state_traceset_seek_time_closest(LttvTracesetState *self, LttTime t)
 
   LttvAttributeName name;
 
-       gboolean is_named;
+  gboolean is_named;
 
   LttvAttribute *saved_states_tree, *saved_state_tree, *closest_tree;
 
@@ -2493,7 +2902,7 @@ void lttv_state_traceset_seek_time_closest(LttvTracesetState *self, LttTime t)
         mid_pos = max_pos / 2;
         while(min_pos < max_pos) {
           type = lttv_attribute_get(saved_states_tree, mid_pos, &name, &value,
-                                                       &is_named);
+              &is_named);
           g_assert(type == LTTV_GOBJECT);
           saved_state_tree = *((LttvAttribute **)(value.v_gobject));
           type = lttv_attribute_get_by_name(saved_state_tree, LTTV_STATE_TIME, 
@@ -2702,8 +3111,8 @@ static void module_init()
   LTTV_STATE_WAIT = g_quark_from_string("WAIT");
   LTTV_STATE_RUN = g_quark_from_string("RUN");
   LTTV_STATE_DEAD = g_quark_from_string("DEAD");
-       LTTV_STATE_USER_THREAD = g_quark_from_string("USER_THREAD");
-       LTTV_STATE_KERNEL_THREAD = g_quark_from_string("KERNEL_THREAD");
+  LTTV_STATE_USER_THREAD = g_quark_from_string("USER_THREAD");
+  LTTV_STATE_KERNEL_THREAD = g_quark_from_string("KERNEL_THREAD");
   LTTV_STATE_TRACEFILES = g_quark_from_string("tracefiles");
   LTTV_STATE_PROCESSES = g_quark_from_string("processes");
   LTTV_STATE_PROCESS = g_quark_from_string("process");
@@ -2756,6 +3165,7 @@ static void module_init()
   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_FILENAME      = g_quark_from_string("filename");
   LTT_FIELD_NAME          = g_quark_from_string("name");
   LTT_FIELD_TYPE          = g_quark_from_string("type");
This page took 0.047688 seconds and 4 git commands to generate.