add new time stamps and drain on SIGUSR1

4 files changed, 53 insertions, 17 deletions

diff --git a/Makefile b/Makefile
index 0bea02f..9927dc4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-CFLAGS=-Wall -g -Iinclude/
+CFLAGS=-Wall -g -Iinclude/ -m64
 CPPFLAGS=-Wall -g
 
 vpath %.h include/
@@ -12,11 +12,11 @@ all: ${TOOLS}
 
 FTCAT_OBJ = ftcat.o timestamp.o
 ftcat: ${FTCAT_OBJ}
-        ${CC} -o ftcat ${FTCAT_OBJ}
+        ${CC} ${CFLAGS} -o ftcat ${FTCAT_OBJ}
 
 FT2CSV_OBJ = ft2csv.o mapping.o timestamp.o
 ft2csv: ${FT2CSV_OBJ}
-        ${CC} -o ft2csv ${FT2CSV_OBJ}
+        ${CC} ${CFLAGS} -o ft2csv ${FT2CSV_OBJ}
 
 clean: 
         rm -rf *.o ${TOOLS}
diff --git a/include/timestamp.h b/include/timestamp.h
index 423a20e..7517bab 100644
--- a/include/timestamp.h
+++ b/include/timestamp.h
@@ -11,14 +11,21 @@ struct timestamp {
 int  str2event(const char* str, unsigned long *id);
 const char* event2str(unsigned long id);
 
-#define ENABLE_CMD 0L
+#define ENABLE_CMD  0L
+#define DISABLE_CMD 1L
 
 #define TIMESTAMP(id) id
 
 #define TS_SCHED_START                  TIMESTAMP(100)
 #define TS_SCHED_END                    TIMESTAMP(101)
-#define TS_CXS_START                    TIMESTAMP(102)
-#define TS_CXS_END                      TIMESTAMP(103)
+#define TS_SCHED2_START                 TIMESTAMP(102)
+#define TS_SCHED2_END                   TIMESTAMP(103)
+
+#define TS_CXS_START                    TIMESTAMP(104)
+#define TS_CXS_END                      TIMESTAMP(105)
+
+#define TS_RELEASE_START                TIMESTAMP(106)
+#define TS_RELEASE_END                  TIMESTAMP(107)
 
 #define TS_TICK_START                   TIMESTAMP(110)
 #define TS_TICK_END                     TIMESTAMP(111)
diff --git a/src/ftcat.c b/src/ftcat.c
index 4d83f56..0afba87 100644
--- a/src/ftcat.c
+++ b/src/ftcat.c
@@ -7,25 +7,37 @@
 
 #include "timestamp.h"
 
+#define MAX_EVENTS 128
+
 static int fd;
+static int event_count = 1;
+static unsigned long  ids[MAX_EVENTS];
 
-static void on_sigint(int sig)
+static int disable_all(int fd)
 {
-        close(fd);
-        exit(0);
+        int ret, size;
+        ids[0] = DISABLE_CMD;
+        fprintf(stderr, "Disabling %d events.\n", event_count - 1);
+        size = event_count * sizeof(long);
+        ret  = write(fd, ids, size);
+        //fprintf(stderr, "write = %d, meant to write %d (%m)\n", ret, size);
+        return size == ret;
 }
 
 static int enable_events(int fd, char* str) 
 {
-        unsigned long   id;
+        unsigned long   *id;
         unsigned long   cmd[3];
 
-        if (!str2event(str, &id))
+        id = ids + event_count;
+        if (!str2event(str, id))
                 return 0;
 
+        event_count += 2;
+        id[1]  = id[0] + 1;
         cmd[0] = ENABLE_CMD;
-        cmd[1] = id;
-        cmd[2] = id + 1;
+        cmd[1] = id[0];
+        cmd[2] = id[1];
         return write(fd, cmd, 3 * sizeof(long)) == 3 * sizeof(long);
 }
 
@@ -34,8 +46,8 @@ static void cat2stdout(int fd)
 {
         static char buf[4096];
         int rd;
-        while ((rd = read(fd, buf, 4096)))
-                fwrite(buf, 1, rd, stdout);     
+        while ((rd = read(fd, buf, 4096)) > 0)
+                fwrite(buf, 1, rd, stdout);
 }
 
 
@@ -49,6 +61,20 @@ static void usage(void)
         exit(1);
 }
 
+static void on_sigint(int sig)
+{
+        close(fd);
+        exit(0);
+}
+
+static void on_sigusr1(int sig)
+{
+        int ok;
+        ok = disable_all(fd);
+        if (!ok)
+                fprintf(stderr, "disable_all: %m\n");
+}
+
 int main(int argc, char** argv) 
 {
         if (argc < 3) 
@@ -61,10 +87,11 @@ int main(int argc, char** argv)
         }
         argc -= 2;
         argv += 2;
-        signal(SIGINT,on_sigint);
+        signal(SIGINT, on_sigint);
+        signal(SIGUSR1, on_sigusr1);
         while (argc--) {
                 if (!enable_events(fd, *argv)) {
-                        fprintf(stderr, "Enabling %s failed.\n", *argv);
+                        fprintf(stderr, "Enabling %s failed: %m\n", *argv);
                         return 2;
                 }
                 argv++;
diff --git a/src/timestamp.c b/src/timestamp.c
index ca03393..b495603 100644
--- a/src/timestamp.c
+++ b/src/timestamp.c
@@ -12,7 +12,9 @@ struct event_name {
 static struct event_name event_table[] = 
 {
         EVENT(SCHED),
+        EVENT(SCHED2),
         EVENT(TICK),
+        EVENT(RELEASE),
         EVENT(PLUGIN_SCHED),
         EVENT(PLUGIN_TICK),
         EVENT(CXS),