3 files changed, 19 insertions, 85 deletions

diff --git a/include/timestamp.h b/include/timestamp.h
index b3393ed..3670541 100644
--- a/include/timestamp.h
+++ b/include/timestamp.h
@@ -47,59 +47,4 @@ const char* event2str(cmd_t id);
 #define TS_PLUGIN_TICK_START            TIMESTAMP(130)
 #define TS_PLUGIN_TICK_END              TIMESTAMP(131)
 
-#define TS_ENTER_NP_START               TIMESTAMP(140)
-#define TS_ENTER_NP_END                 TIMESTAMP(141)
-
-#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 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)
-
-
-
 #endif
diff --git a/src/ftcat.c b/src/ftcat.c
index 28f1924..f0a1c5f 100644
--- a/src/ftcat.c
+++ b/src/ftcat.c
@@ -21,6 +21,8 @@
 #include <string.h>
 #include <signal.h>
 #include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
 
 #include "timestamp.h"
 
@@ -44,14 +46,16 @@ static int disable_all(int fd)
         return size == ret;
 }
 
-static int enable_events(int fd, char* str) 
+static int enable_event(int fd, char* str)
 {
         cmd_t   *id;
         cmd_t   cmd[2];
 
         id = ids + event_count;
-        if (!str2event(str, id))
+        if (!str2event(str, id)) {
+                errno = EINVAL;
                 return 0;
+        }
 
         event_count += 1;
         cmd[0] = ENABLE_CMD;
@@ -60,7 +64,7 @@ static int enable_events(int fd, char* str)
 }
 
 
-static void cat2stdout(int fd) 
+static void cat2stdout(int fd)
 {
         static char buf[4096];
         int rd;
@@ -73,7 +77,7 @@ static void cat2stdout(int fd)
 
 static void usage(void)
 {
-        fprintf(stderr, 
+        fprintf(stderr,
                 "Usage: ftcat <ft device> TS1 TS2 ...."
                 "\n");
         exit(1);
@@ -94,12 +98,12 @@ static void shutdown(int sig)
                 fprintf(stderr, "disable_all: %m\n");
 }
 
-int main(int argc, char** argv) 
+int main(int argc, char** argv)
 {
         const char* trace_file;
-        if (argc < 3) 
+        if (argc < 3)
                 usage();
-        
+
         trace_file = argv[1];
         fd = open(trace_file, O_RDWR);
         if (fd < 0) {
@@ -112,7 +116,7 @@ int main(int argc, char** argv)
         signal(SIGUSR1, shutdown);
         signal(SIGTERM, shutdown);
         while (argc--) {
-                if (!enable_events(fd, *argv)) {
+                if (!enable_event(fd, *argv)) {
                         fprintf(stderr, "Enabling %s failed: %m\n", *argv);
                         return 2;
                 }
diff --git a/src/timestamp.c b/src/timestamp.c
index f3f7861..9ad43f1 100644
--- a/src/timestamp.c
+++ b/src/timestamp.c
@@ -8,9 +8,11 @@ struct event_name {
         cmd_t           id;
 };
 
-#define EVENT(name) {#name, TS_ ## name ## _START}
+#define EVENT(name)                                     \
+        {#name "_START", TS_ ## name ## _START},        \
+        {#name "_END", TS_ ## name ## _END}
 
-static struct event_name event_table[] = 
+static struct event_name event_table[] =
 {
         EVENT(SCHED),
         EVENT(SCHED2),
@@ -19,28 +21,11 @@ static struct event_name event_table[] =
         EVENT(PLUGIN_SCHED),
         EVENT(PLUGIN_TICK),
         EVENT(CXS),
-        EVENT(ENTER_NP),
-        EVENT(EXIT_NP),
-        EVENT(SRP_UP),
-        EVENT(SRP_DOWN),
-        EVENT(PI_UP),
-        EVENT(PI_DOWN),
-        EVENT(FIFO_UP),
-        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, cmd_t *id)
 {
-        int i; 
+        int i;
 
         for (i = 0; i < sizeof(event_table) / sizeof(event_table[0]); i++)
                 if (!strcmp(str, event_table[i].name)) {
@@ -53,11 +38,11 @@ int  str2event(const char* str, cmd_t *id)
 
 const char* event2str(cmd_t id)
 {
-        int i; 
+        int i;
 
         for (i = 0; i < sizeof(event_table) / sizeof(event_table[0]); i++)
                 if (event_table[i].id == id)
                         return event_table[i].name;
-                
+
         return NULL;
 }