update roadmap

[lttv.git] / ltt-control / lttd / lttd.c

diff --git a/ltt-control/lttd/lttd.c b/ltt-control/lttd/lttd.c
index 0deb40230a61007fffc235660d055f19d529e092..e931df5b6e613dfed5553c35435d2c862b05a4e8 100644 (file)
--- a/ltt-control/lttd/lttd.c
+++ b/ltt-control/lttd/lttd.c
@@ -67,12 +67,14 @@ struct channel_trace_fd {
        int num_pairs;
 };
 
-static char *trace_name = NULL;
-static char *channel_name = NULL;
-static int     daemon_mode = 0;
-static int     append_mode = 0;
-static unsigned long num_threads = 1;
+static char            *trace_name = NULL;
+static char            *channel_name = NULL;
+static int             daemon_mode = 0;
+static int             append_mode = 0;
+static unsigned long   num_threads = 1;
 volatile static int    quit_program = 0;       /* For signal handler */
+static int             dump_flight_only = 0;
+static int             dump_normal_only = 0;
 
 /* Args :
  *
@@ -92,6 +94,8 @@ void show_arguments(void)
        printf("-d            Run in background (daemon).\n");
        printf("-a            Append to an possibly existing trace.\n");
        printf("-N            Number of threads to start.\n");
+       printf("-f            Dump only flight recorder channels.\n");
+       printf("-n            Dump only normal channels.\n");
        printf("\n");
 }
 
@@ -143,6 +147,12 @@ int parse_arguments(int argc, char **argv)
                                                        argn++;
                                                }
                                                break;
+                                       case 'f':
+                                               dump_flight_only = 1;
+                                               break;
+                                       case 'n':
+                                               dump_normal_only = 1;
+                                               break;
                                        default:
                                                printf("Invalid argument '%s'.\n", argv[argn]);
                                                printf("\n");
@@ -205,12 +215,12 @@ int open_channel_trace_pairs(char *subchannel_name, char *subtrace_name,
        char path_trace[PATH_MAX];
        int path_trace_len;
        char *path_trace_ptr;
-  int open_ret = 0;
+       int open_ret = 0;
 
        if(channel_dir == NULL) {
                perror(subchannel_name);
                open_ret = ENOENT;
-    goto end;
+               goto end;
        }
 
        printf("Creating trace subdirectory %s\n", subtrace_name);
@@ -218,7 +228,7 @@ int open_channel_trace_pairs(char *subchannel_name, char *subtrace_name,
        if(ret == -1) {
                if(errno != EEXIST) {
                        perror(subtrace_name);
-      open_ret = -1;
+                       open_ret = -1;
                        goto end;
                }
        }
@@ -256,6 +266,17 @@ int open_channel_trace_pairs(char *subchannel_name, char *subtrace_name,
                        ret = open_channel_trace_pairs(path_channel, path_trace, fd_pairs);
                        if(ret < 0) continue;
                } else if(S_ISREG(stat_buf.st_mode)) {
+                       if(strncmp(entry->d_name, "flight-", sizeof("flight-")-1) != 0) {
+                               if(dump_flight_only) {
+                                       printf("Skipping normal channel %s\n", path_channel);
+                                       continue;
+                               }
+                       } else {
+                               if(dump_normal_only) {
+                                       printf("Skipping flight channel %s\n", path_channel);
+                                       continue;
+                               }
+                       }
                        printf("Opening file.\n");
                        
                        fd_pairs->pair = realloc(fd_pairs->pair,
@@ -285,7 +306,7 @@ int open_channel_trace_pairs(char *subchannel_name, char *subtrace_name,
                                } else {
                                        printf("File %s exists, cannot open. Try append mode.\n", path_trace);
                                        open_ret = -1;
-          goto end;
+                                       goto end;
                                }
                        } else {
                                if(errno == ENOENT) {
@@ -609,12 +630,12 @@ int main(int argc, char ** argv)
 
        if(daemon_mode) {
                ret = daemon(0, 0);
-    
-    if(ret == -1) {
-      perror("An error occured while daemonizing.");
-      exit(-1);
-    }
-  }
+               
+               if(ret == -1) {
+                       perror("An error occured while daemonizing.");
+                       exit(-1);
+               }
+       }
 
        /* Connect the signal handlers */
        act.sa_handler = handler;