3 files changed, 43 insertions, 5 deletions

diff --git a/src/ft2csv.c b/src/ft2csv.c
index cc6636f..0df45ce 100644
--- a/src/ft2csv.c
+++ b/src/ft2csv.c
@@ -39,7 +39,7 @@ static unsigned int interleaved = 0;
 
 #define CYCLES_PER_US 2128
 
-static unsigned long long threshold = CYCLES_PER_US * 1000; /* 1 ms == 1 full tick */
+static unsigned long long threshold = CYCLES_PER_US * 10000; /* 10 ms == 10 full ticks */
 
 static struct timestamp* next(struct timestamp* start, struct timestamp* end,
                               int cpu)
@@ -100,7 +100,16 @@ static void show_csv(struct timestamp* first, struct timestamp *end)
                 }
         } else
                 incomplete++;
+}
 
+static void show_single_csv(struct timestamp* ts)
+{
+        if (ts->task_type == TSK_RT) {
+                printf("0, 0, %llu\n",
+                       (unsigned long long) (ts->timestamp));
+                complete++;
+        } else
+                non_rt++;
 }
 
 static inline uint64_t bget(int x, uint64_t quad)
@@ -145,6 +154,14 @@ static void show_id(struct timestamp* start, struct timestamp* end,
                         show_csv(start, end);
 }
 
+static void show_single_records(struct timestamp* start, struct timestamp* end,
+                                unsigned long id)
+{
+        for (; start != end; start++)
+                if (start->event == id)
+                        show_single_csv(start);
+}
+
 #define USAGE \
         "Usage: ft2csv [-e] [-i] [-b] <event_name>  <logfile> \n"       \
         "   -e: endianess swap      -- restores byte order \n"  \
@@ -210,7 +227,11 @@ int main(int argc, char** argv)
 
         if (swap_byte_order)
                 restore_byte_order(ts, end);
-        show_id(ts, end, id);
+
+        if (id >= SINGLE_RECORDS_RANGE)
+                show_single_records(ts, end, id);
+        else
+                show_id(ts, end, id);
 
         fprintf(stderr,
                 "Total       : %10d\n"
diff --git a/src/ftdump.c b/src/ftdump.c
index 599473b..e7b5064 100644
--- a/src/ftdump.c
+++ b/src/ftdump.c
@@ -29,10 +29,16 @@
 static void dump(struct timestamp* ts, size_t count)
 {
         struct timestamp *x;
+        const char* name;
         while (count--) {
                 x = ts++;
-                printf("event:%d seq:%u cpu:%d type:%d\n",
-                       (int) x->event, x->seq_no, x->cpu, x->task_type);
+                name = event2str(x->event);
+                if (name)
+                        printf("%-15s %-8s seq:%u cpu:%d timestamp:%llu\n",
+                               name, task_type2str(x->task_type), x->seq_no, x->cpu, x->timestamp);
+                else
+                        printf("event:%d seq:%u cpu:%d type:%s\n",
+                               (int) x->event, x->seq_no, x->cpu, task_type2str(x->task_type));
         }
 }
 
diff --git a/src/timestamp.c b/src/timestamp.c
index f597b87..34ad448 100644
--- a/src/timestamp.c
+++ b/src/timestamp.c
@@ -29,11 +29,12 @@ int  str2event(const char* str, cmd_t *id)
 {
         int i;
 
-        for (i = 0; i < sizeof(event_table) / sizeof(event_table[0]); i++)
+        for (i = 0; i < sizeof(event_table) / sizeof(event_table[0]); i++) {
                 if (!strcmp(str, event_table[i].name)) {
                         *id = event_table[i].id;
                         return 1;
                 }
+        }
         /* try to parse it as a number */
         return sscanf(str, "%u", id);
 }
@@ -48,3 +49,13 @@ const char* event2str(cmd_t id)
 
         return NULL;
 }
+
+const char* task_type2str(int task_type)
+{
+        if (task_type == TSK_RT)
+                return "RT";
+        else if (task_type == TSK_BE)
+                return "BE";
+        else
+                return "UNKNOWN";
+}