Feather-Trace: rename locking trace points

Since we don't expect to trace more than one lock type at a time,
having protocol-specific trace points is not required.

2 files changed, 8 insertions, 18 deletions

diff --git a/include/litmus/trace.h b/include/litmus/trace.h
index b32c71180774..05f487263f28 100644
--- a/include/litmus/trace.h
+++ b/include/litmus/trace.h
@@ -91,20 +91,10 @@ feather_callback void save_timestamp_cpu(unsigned long event, unsigned long cpu)
 #define TS_EXIT_NP_START                TIMESTAMP(150)
 #define TS_EXIT_NP_END                  TIMESTAMP(151)
 
-#define TS_SRP_UP_START                 TIMESTAMP(160)
-#define TS_SRP_UP_END                   TIMESTAMP(161)
-#define TS_SRP_DOWN_START               TIMESTAMP(162)
-#define TS_SRP_DOWN_END                 TIMESTAMP(163)
-
-#define TS_PI_UP_START                  TIMESTAMP(170)
-#define TS_PI_UP_END                    TIMESTAMP(171)
-#define TS_PI_DOWN_START                TIMESTAMP(172)
-#define TS_PI_DOWN_END                  TIMESTAMP(173)
-
-#define TS_FIFO_UP_START                TIMESTAMP(180)
-#define TS_FIFO_UP_END                  TIMESTAMP(181)
-#define TS_FIFO_DOWN_START              TIMESTAMP(182)
-#define TS_FIFO_DOWN_END                TIMESTAMP(183)
+#define TS_LOCK_START                   TIMESTAMP(170)
+#define TS_LOCK_END                     TIMESTAMP(171)
+#define TS_UNLOCK_START                 TIMESTAMP(172)
+#define TS_UNLOCK_END                   TIMESTAMP(173)
 
 #define TS_SEND_RESCHED_START(c)        CTIMESTAMP(190, c)
 #define TS_SEND_RESCHED_END             DTIMESTAMP(191, TSK_UNKNOWN)
diff --git a/litmus/locking.c b/litmus/locking.c
index 8ee6a6b68009..728b56835cf7 100644
--- a/litmus/locking.c
+++ b/litmus/locking.c
@@ -69,7 +69,7 @@ asmlinkage long sys_litmus_lock(int lock_od)
         struct od_table_entry* entry;
         struct litmus_lock* l;
 
-        TS_PI_DOWN_START;
+        TS_LOCK_START;
 
         entry = get_entry_for_od(lock_od);
         if (entry && is_lock(entry)) {
@@ -80,7 +80,7 @@ asmlinkage long sys_litmus_lock(int lock_od)
 
         /* Note: task my have been suspended or preempted in between!  Take
          * this into account when computing overheads. */
-        TS_PI_DOWN_END;
+        TS_UNLOCK_END;
 
         return err;
 }
@@ -91,7 +91,7 @@ asmlinkage long sys_litmus_unlock(int lock_od)
         struct od_table_entry* entry;
         struct litmus_lock* l;
 
-        TS_PI_UP_START;
+        TS_UNLOCK_START;
 
         entry = get_entry_for_od(lock_od);
         if (entry && is_lock(entry)) {
@@ -102,7 +102,7 @@ asmlinkage long sys_litmus_unlock(int lock_od)
 
         /* Note: task my have been preempted in between!  Take this into
          * account when computing overheads. */
-        TS_PI_UP_END;
+        TS_UNLOCK_END;
 
         return err;
 }