Modified ft to support fz overhead tracingHEADmaster

3 files changed, 15 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 3fcfc38..5ef7325 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 -include .config
 
 # Where is the LITMUS^RT userspace library source tree?
-LIBLITMUS ?= ../liblitmus
+LIBLITMUS ?= ../liblitmus-ext-res
 
 # Include default configuration from liblitmus
 # Liblitmus must have been built before ft_tools can be built.
diff --git a/include/timestamp.h b/include/timestamp.h
index 40050f7..8836071 100644
--- a/include/timestamp.h
+++ b/include/timestamp.h
@@ -49,8 +49,14 @@ const char* task_type2str(int task_type);
 #define TS_LOCK_START                   TIMESTAMP(30)
 #define TS_LOCK_END                     TIMESTAMP(31)
 
-#define TS_READ_LOCK_START              TIMESTAMP(32)
-#define TS_READ_LOCK_END                TIMESTAMP(33)
+#define TS_FZ_ENTER_START               TIMESTAMP(32)
+#define TS_FZ_ENTER_END                 TIMESTAMP(33)
+
+#define TS_FZ_EXIT_START                TIMESTAMP(34)
+#define TS_FZ_EXIT_END                  TIMESTAMP(35)
+
+//#define TS_READ_LOCK_START            TIMESTAMP(32)
+//#define TS_READ_LOCK_END              TIMESTAMP(33)
 
 #define TS_LOCK_SUSPEND                 TIMESTAMP(38)
 #define TS_LOCK_RESUME                  TIMESTAMP(39)
@@ -58,8 +64,8 @@ const char* task_type2str(int task_type);
 #define TS_UNLOCK_START                 TIMESTAMP(40)
 #define TS_UNLOCK_END                   TIMESTAMP(41)
 
-#define TS_READ_UNLOCK_START            TIMESTAMP(42)
-#define TS_READ_UNLOCK_END              TIMESTAMP(43)
+//#define TS_READ_UNLOCK_START          TIMESTAMP(42)
+//#define TS_READ_UNLOCK_END            TIMESTAMP(43)
 
 #define PID_RECORDS_RANGE               99
 
diff --git a/src/timestamp.c b/src/timestamp.c
index 581edc2..057cd18 100644
--- a/src/timestamp.c
+++ b/src/timestamp.c
@@ -32,9 +32,11 @@ static struct event_name event_table[] =
         EVENT(SYSCALL_IN),
         EVENT(SYSCALL_OUT),
         EVENT(LOCK),
+        EVENT(FZ_ENTER),
+        EVENT(FZ_EXIT),
         EVENT(UNLOCK),
-        EVENT(READ_LOCK),
-        EVENT(READ_UNLOCK),
+        //EVENT(READ_LOCK),
+        //EVENT(READ_UNLOCK),
         {"LOCK_SUSPEND", TS_LOCK_SUSPEND},
         {"LOCK_RESUME", TS_LOCK_RESUME},
 };