X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=lttv%2Flttv%2Fprint.c;h=4b7ef44717d93080152384b24737130b425264a1;hb=9c9bf2d4c123db7e0d53714410d642388c8ae8e9;hp=b303900a216b7328761bd7bc6e02d90e1c1c72e8;hpb=f61f4dca50e13aa52b1ca3941c8f420848f4353f;p=lttv.git

diff --git a/lttv/lttv/print.c b/lttv/lttv/print.c
index b303900a..4b7ef447 100644
--- a/lttv/lttv/print.c
+++ b/lttv/lttv/print.c
@@ -50,25 +50,26 @@ static inline void print_enum_events(LttEvent *e, struct marker_field *f,
   LttTracefile *tf = tfs->parent.tf;
   struct marker_info *info = marker_get_info_from_id(tf->mdata, e->event_id);
   LttvTraceState *ts = (LttvTraceState*)(tfs->parent.t_context);
+  LttvNameTables *nt = ts->name_tables;
   
   if (tf->name == LTT_CHANNEL_KERNEL) {
     if (info->name == LTT_EVENT_SYSCALL_ENTRY
         && f->name == LTT_FIELD_SYSCALL_ID) {
       g_string_append_printf(s, " [%s]",
-        g_quark_to_string(ts->syscall_names[value]));
+        g_quark_to_string(nt->syscall_names[value]));
     } else if ((info->name == LTT_EVENT_SOFT_IRQ_ENTRY
                 || info->name == LTT_EVENT_SOFT_IRQ_EXIT
                 || info->name == LTT_EVENT_SOFT_IRQ_RAISE)
                && f->name == LTT_FIELD_SOFT_IRQ_ID) {
       g_string_append_printf(s, " [%s]",
-        g_quark_to_string(ts->soft_irq_names[value]));
+        g_quark_to_string(nt->soft_irq_names[value]));
     } else if (info->name == LTT_EVENT_KPROBE
                && f->name == LTT_FIELD_IP) {
-#if (__SIZEOF_LONG__ == 4)
-      GQuark symbol = (GQuark)g_hash_table_lookup(ts->kprobe_hash,
+#if (__WORDSIZE == 32)
+      GQuark symbol = (GQuark)g_hash_table_lookup(nt->kprobe_hash,
                                           (gconstpointer)&value);
 #else
-      GQuark symbol = (GQuark)g_hash_table_lookup(ts->kprobe_hash,
+      GQuark symbol = (GQuark)(unsigned long)g_hash_table_lookup(nt->kprobe_hash,
                                           (gconstpointer)value);
 #endif
       if (symbol)
@@ -276,21 +277,20 @@ void lttv_event_to_string(LttEvent *e, GString *s,
   if(mandatory_fields) {
     time = ltt_event_time(e);
     g_string_append_printf(s,"%s.%s: %ld.%09ld (%s/%s_%u)",
-	g_quark_to_string(ltt_tracefile_name(tfs->parent.tf)),
-        g_quark_to_string(info->name),
-        (long)time.tv_sec, time.tv_nsec,
-	g_quark_to_string(
-		ltt_trace_name(ltt_tracefile_get_trace(tfs->parent.tf))),
-        g_quark_to_string(ltt_tracefile_name(tfs->parent.tf)),
-        cpu);
+      g_quark_to_string(ltt_tracefile_name(tfs->parent.tf)),
+      g_quark_to_string(info->name), (long)time.tv_sec, time.tv_nsec,
+      g_quark_to_string(
+        ltt_trace_name(ltt_tracefile_get_trace(tfs->parent.tf))),
+      g_quark_to_string(ltt_tracefile_name(tfs->parent.tf)), cpu);
     /* Print the process id and the state/interrupt type of the process */
     g_string_append_printf(s,", %u, %u, %s, %s, %u, 0x%" PRIx64", %s",
-			   process->pid,
-			   process->tgid,
-			   g_quark_to_string(process->name),
-			   g_quark_to_string(process->brand),
-			   process->ppid, process->current_function,
-			   g_quark_to_string(process->state->t));
+      process->pid,
+      process->tgid,
+      g_quark_to_string(process->name),
+      g_quark_to_string(process->brand),
+      process->ppid,
+      process->current_function,
+      g_quark_to_string(process->state->t));
   }
   
   if(marker_get_num_fields(info) == 0) return;