2 files changed, 17 insertions, 8 deletions

diff --git a/include/timestamp.h b/include/timestamp.h
index 57fd0bc..b3b10ce 100644
--- a/include/timestamp.h
+++ b/include/timestamp.h
@@ -9,8 +9,15 @@ enum task_type_marker {
         TSK_UNKNOWN
 };
 
+/* Note: bitfields are highly non-portable (allocation is completely
+ * implementation-defined).  Make sure you use the *same* compiler as the one
+ * used for the kernel itself (this works with gcc in practice, but is not
+ * *guaranteed* to work).  Patches to get rid of the bitfields (without
+ * enlarging the structure) are highly welcome.
+ */
 struct timestamp {
-        uint64_t                timestamp;
+        uint64_t                timestamp:48;
+        uint64_t                pid:16;
         uint32_t                seq_no;
         uint8_t                 cpu;
         uint8_t                 event;
diff --git a/src/ftdump.c b/src/ftdump.c
index 1462c4d..1e4bc12 100644
--- a/src/ftdump.c
+++ b/src/ftdump.c
@@ -29,26 +29,30 @@
 static void dump(struct timestamp* ts, size_t count)
 {
         struct timestamp *x;
-        unsigned int last_seq = 0;
+        uint32_t last_seq = 0, next_seq;
         const char* name;
         while (count--) {
                 x = ts++;
                 name = event2str(x->event);
-                if (last_seq && last_seq + 1 != x->seq_no)
+                next_seq = last_seq + 1;
+                if (last_seq && next_seq != x->seq_no)
                         printf("==== non-consecutive sequence number ====\n");
                 last_seq = x->seq_no;
                 if (name)
-                        printf("%-20s seq:%u  timestamp:%llu  cpu:%d  type:%-8s irq:%u irqc:%02u \n",
+                        printf("%-20s seq:%u  pid:%u  timestamp:%llu  cpu:%d"
+                               "  type:%-8s irq:%u irqc:%02u \n",
                                name,  x->seq_no,
+                               x->pid,
                                (unsigned long long)  x->timestamp,
                                x->cpu,
                                task_type2str(x->task_type),
                                x->irq_flag,
                                x->irq_count);
                 else
-                        printf("%16s:%3u seq:%u  timestamp:%llu  cpu:%u  type:%-8s irq:%u irqc:%02u\n",
+                        printf("%16s:%3u seq:%u pid:%u  timestamp:%llu  cpu:%u"
+                               "  type:%-8s irq:%u irqc:%02u\n",
                                "event",
-                               (unsigned int) x->event, x->seq_no,
+                               (unsigned int) x->event, x->seq_no, x->pid,
                                (unsigned long long)  x->timestamp,
                                x->cpu,
                                task_type2str(x->task_type),
@@ -75,12 +79,10 @@ int main(int argc, char** argv)
 
         printf("struct timestamp:\n"
                "\t size              = %3lu\n"
-               "\t offset(timestamp) = %3lu\n"
                "\t offset(seq_no)    = %3lu\n"
                "\t offset(cpu)       = %3lu\n"
                "\t offset(event)     = %3lu\n",
                (unsigned long) sizeof(struct timestamp),
-               offset(struct timestamp, timestamp),
                offset(struct timestamp, seq_no),
                offset(struct timestamp, cpu),
                offset(struct timestamp, event));