event naming

1 files changed, 17 insertions, 18 deletions

diff --git a/src/ftcat.c b/src/ftcat.c
index bb7b3e6..151fa29 100644
--- a/src/ftcat.c
+++ b/src/ftcat.c
@@ -2,34 +2,34 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
+#include <signal.h>
+#include <stdlib.h>
 
 #include "timestamp.h"
 
+static int fd;
+
+static void on_sigint(int sig)
+{
+        close(fd);
+        exit(0);
+}
 
 static int enable_events(int fd, char* str) 
 {
-        long   id;
-        long   cmd[3];
+        unsigned long   id;
+        unsigned long   cmd[3];
 
-        if        (!strcmp(str, "sched")) {
-                id = TS_SCHED_START;            
-        } else if (!strcmp(str, "tick")) {
-                id = TS_TICK_START;
-        } else if (!strcmp(str, "plug_tick")) {
-                id = TS_PLUGIN_TICK_START;
-        } else if (!strcmp(str, "plug_sched")) {
-                id = TS_PLUGIN_SCHED_START;
-        } else
+        if (!str2event(str, &id))
                 return 0;
 
         cmd[0] = ENABLE_CMD;
         cmd[1] = id;
-        cmd[2] = id + 2;
+        cmd[2] = id + 1;
         return write(fd, cmd, 3 * sizeof(long)) == 3 * sizeof(long);
 }
 
 
-
 static void cat2stdout(int fd) 
 {
         static char buf[4096];
@@ -43,19 +43,17 @@ static void usage(void)
 {
         fprintf(stderr, 
                 "Usage: ftcat <ft device> TS1 TS2 ....\n\n"
-                "where TS1, TS2, ... is one of "
-                " sched, tick, plug_tick, plug_sched"
+                //              "where TS1, TS2, ... is one of "
+                //              " sched, tick, plug_tick, plug_sche"
                 "\n");
         exit(1);
 }
 
 int main(int argc, char** argv) 
 {
-        int fd;
-
         if (argc < 3) 
                 usage();
-
+        
         fd = open(argv[1], O_RDWR);
         if (fd < 0) {
                 perror("could not open feathertrace");
@@ -63,6 +61,7 @@ int main(int argc, char** argv)
         }
         argc -= 2;
         argv += 2;
+        signal(SIGINT,on_sigint);
         while (argc--) {
                 if (!enable_events(fd, *argv)) {
                         fprintf(stderr, "Enabling %s failed.\n", *argv);