Merge remote-tracking branch 'remotes/mpi/master' into wip-mc

Conflicts:
	src/ft2csv.c
	src/ftdump.c

2 files changed, 21 insertions, 34 deletions

diff --git a/src/ft2csv.c b/src/ft2csv.c
index ce44c7e..b75b284 100644
--- a/src/ft2csv.c
+++ b/src/ft2csv.c
@@ -37,7 +37,6 @@ static int only_cpu  = -1;
 
 static unsigned int complete   = 0;
 static unsigned int incomplete = 0;
-static unsigned int filtered   = 0;
 static unsigned int skipped    = 0;
 static unsigned int non_rt     = 0;
 static unsigned int interleaved = 0;
@@ -46,9 +45,9 @@ static unsigned int lvl_a_sched = 0;
 static unsigned int lvl_b_sched = 0;
 static unsigned int lvl_c_sched = 0;
 static unsigned int other_sched = 0;
+static unsigned int filtered = 0;
 
 #define CYCLES_PER_US 2128
-
 static unsigned long long threshold = CYCLES_PER_US * 10000; /* 10 ms == 10 full ticks */
 
 static struct timestamp* next(struct timestamp* start, struct timestamp* end,
@@ -428,5 +427,6 @@ int main(int argc, char** argv)
                 interleaved, lvl_a_sched, lvl_b_sched, lvl_c_sched,
                 other_sched);
 
+
         return 0;
 }
diff --git a/src/ftdump.c b/src/ftdump.c
index 65cbe3f..1462c4d 100644
--- a/src/ftdump.c
+++ b/src/ftdump.c
@@ -37,34 +37,23 @@ static void dump(struct timestamp* ts, size_t count)
                 if (last_seq && last_seq + 1 != x->seq_no)
                         printf("==== non-consecutive sequence number ====\n");
                 last_seq = x->seq_no;
-                if (x->event <= PID_RECORDS_RANGE) {
-                        if (name)
-                                printf("%-20s seq:%u  timestamp:%llu  pid:%u\n",
-                                       name, x->seq_no,
-                                       (unsigned long long)  x->timestamp,
-                                       ts_pid_fragment(x));
-                        else
-                                printf("%16s:%3u seq:%u  timestamp:%llu  pid:%u\n",
-                                       "event",
-                                       (unsigned int) x->event, x->seq_no,
-                                       (unsigned long long)  x->timestamp,
-                                       ts_pid_fragment(x));
-                }
-                else {
-                        if (name)
-                                printf("%-20s seq:%u  timestamp:%llu  cpu:%d  type:%-8s \n",
-                                       name,  x->seq_no,
-                                       (unsigned long long)  x->timestamp,
-                                       x->cpu,
-                                       task_type2str(x->task_type));
-                        else
-                                printf("%16s:%3u seq:%u  timestamp:%llu  cpu:%u  type:%-8s\n",
-                                       "event",
-                                       (unsigned int) x->event, x->seq_no,
-                                       (unsigned long long)  x->timestamp,
-                                       x->cpu,
-                                       task_type2str(x->task_type));
-                }
+                if (name)
+                        printf("%-20s seq:%u  timestamp:%llu  cpu:%d  type:%-8s irq:%u irqc:%02u \n",
+                               name,  x->seq_no,
+                               (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",
+                               "event",
+                               (unsigned int) x->event, x->seq_no,
+                               (unsigned long long)  x->timestamp,
+                               x->cpu,
+                               task_type2str(x->task_type),
+                               x->irq_flag,
+                               x->irq_count);
         }
 }
 
@@ -89,14 +78,12 @@ int main(int argc, char** argv)
                "\t offset(timestamp) = %3lu\n"
                "\t offset(seq_no)    = %3lu\n"
                "\t offset(cpu)       = %3lu\n"
-               "\t offset(event)     = %3lu\n"
-               "\t offset(task_type) = %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),
-               offset(struct timestamp, task_type));
+               offset(struct timestamp, event));
 
         if (argc != 2)
                 die("Usage: ftdump  <logfile>");