Added lvl b and c macros

3 files changed, 44 insertions, 7 deletions

diff --git a/include/timestamp.h b/include/timestamp.h
index d1f73d1..64a0f23 100644
--- a/include/timestamp.h
+++ b/include/timestamp.h
@@ -7,7 +7,9 @@ enum task_type_marker {
         TSK_BE,
         TSK_RT,
         TSK_UNKNOWN,
-        TSK_LVLA
+        TSK_LVLA,
+        TSK_LVLB,
+        TSK_LVLC
 };
 
 struct timestamp {
@@ -74,6 +76,18 @@ const char* task_type2str(int task_type);
 #define TS_LVLA_SCHED_START             TIMESTAMP(114)
 #define TS_LVLA_SCHED_END               TIMESTAMP(115)
 
+#define TS_LVLB_RELEASE_START           TIMESTAMP(116)
+#define TS_LVLB_RELEASE_END             TIMESTAMP(117)
+
+#define TS_LVLB_SCHED_START             TIMESTAMP(118)
+#define TS_LVLB_SCHED_END               TIMESTAMP(119)
+
+#define TS_LVLC_RELEASE_START           TIMESTAMP(120)
+#define TS_LVLC_RELEASE_END             TIMESTAMP(121)
+
+#define TS_LVLC_SCHED_START             TIMESTAMP(122)
+#define TS_LVLC_SCHED_END               TIMESTAMP(123)
+
 #define TS_PLUGIN_SCHED_START           TIMESTAMP(120)
 #define TS_PLUGIN_SCHED_END             TIMESTAMP(121)
 
diff --git a/src/ft2csv.c b/src/ft2csv.c
index 33b65c4..ce44c7e 100644
--- a/src/ft2csv.c
+++ b/src/ft2csv.c
@@ -43,7 +43,9 @@ static unsigned int non_rt     = 0;
 static unsigned int interleaved = 0;
 static unsigned int avoided    = 0;
 static unsigned int lvl_a_sched = 0;
-static unsigned int lvl_a_sched_not_a = 0;
+static unsigned int lvl_b_sched = 0;
+static unsigned int lvl_c_sched = 0;
+static unsigned int other_sched = 0;
 
 #define CYCLES_PER_US 2128
 
@@ -223,17 +225,31 @@ static void find_event_by_eid(struct timestamp *first, struct timestamp* end)
                         if (TS_LVLA_SCHED_END == second->event &&
                             second->task_type == TSK_LVLA)
                         {
-                                /* second could be a level-A task */
                                 format_pair(first, second, exec_time);
                                 complete++;
                                 lvl_a_sched++;
+                        } else if (TS_LVLB_SCHED_END == second->event &&
+                                   second->task_type == TSK_LVLB)
+                        {
+                                format_pair(first, second, exec_time);
+                                complete++;
+                                lvl_b_sched++;
+                        } else if (TS_LVLC_SCHED_END == second->event &&
+                                   second->task_type == TSK_LVLC)
+                        {
+                                format_pair(first, second, exec_time);
+                                complete++;
+                                lvl_c_sched++;
+
                         } else {
                                 non_rt++;
                         }
-                } else if (TS_LVLA_SCHED_END == second->event &&
+                } else if ((TS_LVLA_SCHED_END == second->event ||
+                            TS_LVLB_SCHED_END == second->event ||
+                            TS_LVLC_SCHED_END == second->event) &&
                            TSK_RT == second->task_type)
                 {
-                        lvl_a_sched_not_a++;
+                        other_sched++;
                 } else
                 {
                         format_pair(first, second, exec_time);
@@ -403,11 +419,14 @@ int main(int argc, char** argv)
                 "Non RT              : %10d\n"
                 "Interleaved         : %10d\n"
                 "Lvl-A Sched         : %10d\n"
-                "Lvl-A Sched (non-A) : %10d\n",
+                "Lvl-B Sched         : %10d\n"
+                "Lvl-C Sched         : %10d\n"
+                "Other Sched (non-A) : %10d\n",
                 (int) count,
                 skipped, avoided, complete,
                 incomplete, filtered, non_rt,
-                interleaved, lvl_a_sched, lvl_a_sched_not_a);
+                interleaved, lvl_a_sched, lvl_b_sched, lvl_c_sched,
+                other_sched);
 
         return 0;
 }
diff --git a/src/timestamp.c b/src/timestamp.c
index fa8310d..cad3fb5 100644
--- a/src/timestamp.c
+++ b/src/timestamp.c
@@ -24,6 +24,10 @@ static struct event_name event_table[] =
         EVENT(SEND_RESCHED),
         EVENT(LVLA_RELEASE),
         EVENT(LVLA_SCHED),
+        EVENT(LVLB_RELEASE),
+        EVENT(LVLB_SCHED),
+        EVENT(LVLC_RELEASE),
+        EVENT(LVLC_SCHED),
         {"RELEASE_LATENCY", TS_RELEASE_LATENCY},
 
         EVENT(SYSCALL_IN),