Add more tracing pointwip-gedf-tracing

- match commits 586d7efef0703adde6c94b884f7825e9d29dfe7b
  and 936fe39f331fe86aa77740e1fb87d906ccbf2eee
  in litmus2010 wip-cedf

2 files changed, 38 insertions, 10 deletions

diff --git a/include/timestamp.h b/include/timestamp.h
index a54d2a3..e59a264 100644
--- a/include/timestamp.h
+++ b/include/timestamp.h
@@ -41,20 +41,41 @@ const char* event2str(cmd_t id);
 #define TS_TICK_START                   TIMESTAMP(110)
 #define TS_TICK_END                     TIMESTAMP(111)
 
-#define TS_PRESCHED_START               TIMESTAMP(114)
-#define TS_PRESCHED_END                 TIMESTAMP(115)
+#define TS_PSCHED_START                 TIMESTAMP(112)
+#define TS_PSCHED_END                   TIMESTAMP(113)
 
-#define TS_PUTPREV_START                TIMESTAMP(116)
-#define TS_PUTPREV_END                  TIMESTAMP(117)
+#define TS_MIGRAT_START                 TIMESTAMP(114)
+#define TS_MIGRAT_END                   TIMESTAMP(115)
+
+#define TS_LINK_START                   TIMESTAMP(116)
+#define TS_LINK_END                     TIMESTAMP(117)
 
 #define TS_PICKNEXT_START               TIMESTAMP(118)
 #define TS_PICKNEXT_END                 TIMESTAMP(119)
 
-#define TS_PLUGIN_SCHED_START           TIMESTAMP(120)
-#define TS_PLUGIN_SCHED_END             TIMESTAMP(121)
+#define TS_REQUEUE_START                TIMESTAMP(120)
+#define TS_REQUEUE_END                  TIMESTAMP(121)
+
+#define TS_ADDRELEASE_START             TIMESTAMP(122)
+#define TS_ADDRELEASE_END               TIMESTAMP(123)
+
+#define TS_CHECKPREEMPT_START           TIMESTAMP(124)
+#define TS_CHECKPREEMPT_END             TIMESTAMP(125)
+
+#define TS_MERGE_START                  TIMESTAMP(126)
+#define TS_MERGE_END                    TIMESTAMP(127)
+
+#define TS_SLOCK_START                  TIMESTAMP(128)
+#define TS_SLOCK_END                    TIMESTAMP(129)
+
+#define TS_SNOLOCK_START                TIMESTAMP(132)
+#define TS_SNOLOCK_END                  TIMESTAMP(133)
+
+#define TS_PLUGIN_SCHED_START           /* TIMESTAMP(120) */
+#define TS_PLUGIN_SCHED_END             /* TIMESTAMP(121) */
 
-#define TS_PLUGIN_TICK_START            TIMESTAMP(130)
-#define TS_PLUGIN_TICK_END              TIMESTAMP(131)
+#define TS_PLUGIN_TICK_START            /* TIMESTAMP(130) */
+#define TS_PLUGIN_TICK_END              /* TIMESTAMP(131) */
 
 #define TS_SEND_RESCHED_START           TIMESTAMP(190)
 #define TS_SEND_RESCHED_END             TIMESTAMP(191)
diff --git a/src/timestamp.c b/src/timestamp.c
index bec40f3..79ae745 100644
--- a/src/timestamp.c
+++ b/src/timestamp.c
@@ -22,9 +22,16 @@ static struct event_name event_table[] =
         EVENT(PLUGIN_TICK),
         EVENT(CXS),
         EVENT(SEND_RESCHED),
-        EVENT(PRESCHED),
-        EVENT(PUTPREV),
+        EVENT(PSCHED),
+        EVENT(MIGRAT),
+        EVENT(LINK),
         EVENT(PICKNEXT),
+        EVENT(REQUEUE),
+        EVENT(ADDRELEASE),
+        EVENT(CHECKPREEMPT),
+        EVENT(MERGE),
+        EVENT(SLOCK),
+        EVENT(SNOLOCK),
 };
 
 int  str2event(const char* str, cmd_t *id)