add PCP timestamps

3 files changed, 43 insertions, 3 deletions

diff --git a/include/timestamp.h b/include/timestamp.h
index 6d69150..423a20e 100644
--- a/include/timestamp.h
+++ b/include/timestamp.h
@@ -13,7 +13,7 @@ const char* event2str(unsigned long id);
 
 #define ENABLE_CMD 0L
 
-#define TIMESTAMP(id) id ## L
+#define TIMESTAMP(id) id
 
 #define TS_SCHED_START                  TIMESTAMP(100)
 #define TS_SCHED_END                    TIMESTAMP(101)
@@ -50,6 +50,37 @@ const char* event2str(unsigned long id);
 #define TS_FIFO_DOWN_START              TIMESTAMP(182)
 #define TS_FIFO_DOWN_END                TIMESTAMP(183)
 
+#define PCP1    200
+#define PCP2    204
+
+#define DPCP    210
+#define MPCP    220
+#define FMLP    230
+#define SRPT    240
+
+#define TS_PCP_UP_START                 TIMESTAMP(PCP1)
+#define TS_PCP_UP_END                   TIMESTAMP(PCP1 + 1)
+#define TS_PCP1_DOWN_START              TIMESTAMP(PCP1 + 2)
+#define TS_PCP1_DOWN_END                TIMESTAMP(PCP1 + 3)
+#define TS_PCP2_DOWN_START              TIMESTAMP(PCP2 + 2)
+
+#define TS_PCP2_DOWN_END                TIMESTAMP(PCP2 + 3)
+
+#define TS_DPCP_INVOKE_START            TIMESTAMP(DPCP)
+#define TS_DPCP_INVOKE_END              TIMESTAMP(DPCP + 1)
+#define TS_DPCP_AGENT1_START            TIMESTAMP(DPCP + 2)
+#define TS_DPCP_AGENT1_END              TIMESTAMP(DPCP + 3)
+#define TS_DPCP_AGENT2_START            TIMESTAMP(DPCP + 4)
+#define TS_DPCP_AGENT2_END              TIMESTAMP(DPCP + 5)
+
+#define TS_MPCP_UP_START                TIMESTAMP(MPCP)
+#define TS_MPCP_UP_END                  TIMESTAMP(MPCP + 1)
+#define TS_MPCP_DOWN_START              TIMESTAMP(MPCP + 2)
+#define TS_MPCP_DOWN_END                TIMESTAMP(MPCP + 3)
+
+
+#define TS_SRPT_START                   TIMESTAMP(SRPT)
+#define TS_SRPT_END                     TIMESTAMP(SRPT + 1)
 
 
 
diff --git a/src/ftcat.c b/src/ftcat.c
index 151fa29..4d83f56 100644
--- a/src/ftcat.c
+++ b/src/ftcat.c
@@ -34,7 +34,7 @@ static void cat2stdout(int fd)
 {
         static char buf[4096];
         int rd;
-        while (rd = read(fd, buf, 4096))
+        while ((rd = read(fd, buf, 4096)))
                 fwrite(buf, 1, rd, stdout);     
 }
 
diff --git a/src/timestamp.c b/src/timestamp.c
index b7e78c9..ca03393 100644
--- a/src/timestamp.c
+++ b/src/timestamp.c
@@ -23,7 +23,16 @@ static struct event_name event_table[] =
         EVENT(PI_UP),
         EVENT(PI_DOWN),
         EVENT(FIFO_UP),
-        EVENT(FIFO_DOWN)
+        EVENT(FIFO_DOWN),
+        EVENT(PCP_UP),
+        EVENT(PCP1_DOWN),
+        EVENT(PCP2_DOWN),
+        EVENT(DPCP_INVOKE),
+        EVENT(DPCP_AGENT1),
+        EVENT(DPCP_AGENT2),
+        EVENT(MPCP_UP),
+        EVENT(MPCP_DOWN),
+        EVENT(SRPT)
 };
 
 int  str2event(const char* str, unsigned long *id)