update/
[ltt-control.git] / ltt-control / lttctl / lttctl.c
index bdf6f98ab1be9fc2822e1e61f3c68b1d1d54234f..301a4a366a253ef32b6f33f40d1b9cedc1975d4d 100644 (file)
 #define BUF_SIZE 4096
 
 enum trace_ctl_op {
-  CTL_OP_CREATE_START,
+       CTL_OP_CREATE_START,
        CTL_OP_CREATE,
        CTL_OP_DESTROY,
-  CTL_OP_STOP_DESTROY,
+       CTL_OP_STOP_DESTROY,
        CTL_OP_START,
        CTL_OP_STOP,
        CTL_OP_DAEMON,
@@ -51,15 +51,6 @@ static char *channel_root = NULL;
 static char *trace_root = NULL;
 static char *num_threads = "1";
 
-static int sigchld_received = 0;
-
-void sigchld_handler(int signo)
-{
-       printf("signal %d received\n", signo);
-       sigchld_received = 1;
-}
-
-
 /* Args :
  *
  */
@@ -76,7 +67,7 @@ void show_arguments(void)
        printf("-R            Stop tracing and destroy trace channels.\n");
        printf("-s            Start tracing.\n");
        //printf("              Note : will automatically create a normal trace if "
-       //                                                                                      "none exists.\n");
+       //                      "none exists.\n");
        printf("-q            Stop tracing.\n");
        printf("-d            Create trace, spawn a lttd daemon, start tracing.\n");
        printf("              (optionnaly, you can set LTT_DAEMON\n");
@@ -127,12 +118,12 @@ int parse_arguments(int argc, char **argv)
                                                }
 
                                                break;
-          case 'b':
-            op = CTL_OP_CREATE_START;
+                                       case 'b':
+                                               op = CTL_OP_CREATE_START;
                                                break;
                                        case 'c':
                                                op = CTL_OP_CREATE;
-            break;
+                                               break;
                                        case 'm':
                                                if(argn+1 < argc) {
                                                        mode_name = argv[argn+1];
@@ -187,9 +178,9 @@ int parse_arguments(int argc, char **argv)
                                        case 'd':
                                                op = CTL_OP_DAEMON;
                                                break;
-          case 'e':
-            op = CTL_OP_DESCRIPTION;
-            break;
+                                       case 'e':
+                                               op = CTL_OP_DESCRIPTION;
+                                               break;
                                        case 't':
                                                if(argn+1 < argc) {
                                                        trace_root = argv[argn+1];
@@ -210,10 +201,10 @@ int parse_arguments(int argc, char **argv)
                                                        ret = EINVAL;
                                                }
                                                break;
-          case 'a':
-            append_trace = 1;
-            break;
-          case 'N':
+                                       case 'a':
+                                               append_trace = 1;
+                                               break;
+                                       case 'N':
                                                if(argn+1 < argc) {
                                                        num_threads = argv[argn+1];
                                                        argn++;
@@ -268,13 +259,13 @@ int parse_arguments(int argc, char **argv)
                }
        }
 
-  if(op == CTL_OP_DESCRIPTION) {
-    if(trace_root == NULL) {
+       if(op == CTL_OP_DESCRIPTION) {
+               if(trace_root == NULL) {
                        printf("Please specify -t trace_root_path with the -e option.\n");
                        printf("\n");
                        ret = EINVAL;
-    }
-  }
+               }
+       }
 
        return ret;
 }
@@ -283,105 +274,105 @@ void show_info(void)
 {
        printf("Linux Trace Toolkit Trace Control\n");
        printf("\n");
-  if(trace_name != NULL) {
-       printf("Controlling trace : %s\n", trace_name);
-       printf("\n");
-  }
+       if(trace_name != NULL) {
+               printf("Controlling trace : %s\n", trace_name);
+               printf("\n");
+       }
 }
 
 int create_eventdefs(void)
 {
-  int ret = 0;
-  char eventdefs_path[PATH_MAX];
-  char eventdefs_file[PATH_MAX];
-  char facilities_file[PATH_MAX];
-  char read_buf[BUF_SIZE];
-  struct dirent *entry;
+       int ret = 0;
+       char eventdefs_path[PATH_MAX];
+       char eventdefs_file[PATH_MAX];
+       char facilities_file[PATH_MAX];
+       char read_buf[BUF_SIZE];
+       struct dirent *entry;
        char *facilities_path = getenv("LTT_FACILITIES");
        if(facilities_path == NULL) facilities_path =
-          PACKAGE_DATA_DIR "/" PACKAGE "/facilities";
-
-  ret = mkdir(trace_root, S_IRWXU|S_IRWXG|S_IRWXO);
-  if(ret == -1 && errno != EEXIST) {
-    ret = errno;
-    perror("Cannot create trace_root directory");
-    printf("trace_root is %s\n", trace_root);
-    goto error;
-  }
-  ret = 0;
-  
-  size_t trace_root_len = strlen(trace_root);
-  strncpy(eventdefs_path, trace_root, PATH_MAX);
-  strncat(eventdefs_path, "/eventdefs/", PATH_MAX - trace_root_len);
-  size_t eventdefs_path_len = strlen(eventdefs_path);
-  ret = mkdir(eventdefs_path, S_IRWXU|S_IRWXG|S_IRWXO);
-  if(ret == -1 && (!append_trace || errno != EEXIST)) {
-    ret = errno;
-    perror("Cannot create eventdefs directory");
-    goto error;
-  }
-  ret = 0;
-  
-  DIR *facilities_dir = opendir(facilities_path);
-  
-  if(facilities_dir == NULL) {
-    perror("Cannot open facilities directory");
-    ret = EEXIST;
-    goto error;
-  }
-
-  while((entry = readdir(facilities_dir)) != NULL) {
-    if(entry->d_name[0] == '.') continue;
-    
-    printf("Appending facility file %s\n", entry->d_name);
-    strncpy(eventdefs_file, eventdefs_path, PATH_MAX);
-    strncat(eventdefs_file, entry->d_name, PATH_MAX - eventdefs_path_len);
-    /* Append to the file */
-    FILE *dest = fopen(eventdefs_file, "a");
-    if(!dest) {
-      perror("Cannot create eventdefs file");
-      continue;
-    }
-    strncpy(facilities_file, facilities_path, PATH_MAX);
-    size_t facilities_dir_len = strlen(facilities_path);
-    strncat(facilities_file, "/", PATH_MAX - facilities_dir_len);
-    strncat(facilities_file, entry->d_name, PATH_MAX - facilities_dir_len-1);
-    FILE *src = fopen(facilities_file, "r");
-    if(!src) {
-      ret = errno;
-      perror("Cannot open eventdefs file for reading");
-      goto close_dest;
-    }
-
-    do {
-      size_t read_size, write_size;
-      read_size = fread(read_buf, sizeof(char), BUF_SIZE, src);
-      if(ferror(src)) {
-        ret = errno;
-        perror("Cannot read eventdefs file");
-        goto close_src;
-      }
-      write_size = fwrite(read_buf, sizeof(char), read_size, dest);
-      if(ferror(dest)) {
-        ret = errno;
-        perror("Cannot write eventdefs file");
-        goto close_src;
-      }
-    } while(!feof(src));
-
-    /* Add spacing between facilities */
-    fwrite("\n", 1, 1, dest);
-    
+                                       PACKAGE_DATA_DIR "/" PACKAGE "/facilities";
+
+       ret = mkdir(trace_root, S_IRWXU|S_IRWXG|S_IRWXO);
+       if(ret == -1 && errno != EEXIST) {
+               ret = errno;
+               perror("Cannot create trace_root directory");
+               printf("trace_root is %s\n", trace_root);
+               goto error;
+       }
+       ret = 0;
+       
+       size_t trace_root_len = strlen(trace_root);
+       strncpy(eventdefs_path, trace_root, PATH_MAX);
+       strncat(eventdefs_path, "/eventdefs/", PATH_MAX - trace_root_len);
+       size_t eventdefs_path_len = strlen(eventdefs_path);
+       ret = mkdir(eventdefs_path, S_IRWXU|S_IRWXG|S_IRWXO);
+       if(ret == -1 && (!append_trace || errno != EEXIST)) {
+               ret = errno;
+               perror("Cannot create eventdefs directory");
+               goto error;
+       }
+       ret = 0;
+       
+       DIR *facilities_dir = opendir(facilities_path);
+       
+       if(facilities_dir == NULL) {
+               perror("Cannot open facilities directory");
+               ret = EEXIST;
+               goto error;
+       }
+
+       while((entry = readdir(facilities_dir)) != NULL) {
+               if(entry->d_name[0] == '.') continue;
+               
+               printf("Appending facility file %s\n", entry->d_name);
+               strncpy(eventdefs_file, eventdefs_path, PATH_MAX);
+               strncat(eventdefs_file, entry->d_name, PATH_MAX - eventdefs_path_len);
+               /* Append to the file */
+               FILE *dest = fopen(eventdefs_file, "a");
+               if(!dest) {
+                       perror("Cannot create eventdefs file");
+                       continue;
+               }
+               strncpy(facilities_file, facilities_path, PATH_MAX);
+               size_t facilities_dir_len = strlen(facilities_path);
+               strncat(facilities_file, "/", PATH_MAX - facilities_dir_len);
+               strncat(facilities_file, entry->d_name, PATH_MAX - facilities_dir_len-1);
+               FILE *src = fopen(facilities_file, "r");
+               if(!src) {
+                       ret = errno;
+                       perror("Cannot open eventdefs file for reading");
+                       goto close_dest;
+               }
+
+               do {
+                       size_t read_size, write_size;
+                       read_size = fread(read_buf, sizeof(char), BUF_SIZE, src);
+                       if(ferror(src)) {
+                               ret = errno;
+                               perror("Cannot read eventdefs file");
+                               goto close_src;
+                       }
+                       write_size = fwrite(read_buf, sizeof(char), read_size, dest);
+                       if(ferror(dest)) {
+                               ret = errno;
+                               perror("Cannot write eventdefs file");
+                               goto close_src;
+                       }
+               } while(!feof(src));
+
+               /* Add spacing between facilities */
+               fwrite("\n", 1, 1, dest);
+               
 close_src:
-    fclose(src);
+               fclose(src);
 close_dest:
-    fclose(dest);
-  }
+               fclose(dest);
+       }
 
-  closedir(facilities_dir);
+       closedir(facilities_dir);
 
 error:
-  return ret;
+       return ret;
 
 }
 
@@ -392,10 +383,9 @@ int lttctl_daemon(struct lttctl_handle *handle, char *trace_name)
        pid_t pid;
        int ret;
        char *lttd_path = getenv("LTT_DAEMON");
-       struct sigaction act;
 
        if(lttd_path == NULL) lttd_path = 
-    PACKAGE_BIN_DIR "/lttd";
+               PACKAGE_BIN_DIR "/lttd";
        
        strcat(channel_path, channel_root);
        strcat(channel_path, "/");
@@ -405,39 +395,39 @@ int lttctl_daemon(struct lttctl_handle *handle, char *trace_name)
        ret = lttctl_create_trace(handle, trace_name, mode, trace_type, subbuf_size, n_subbufs);
        if(ret != 0) goto create_error;
 
-       act.sa_handler = sigchld_handler;
-       sigemptyset(&(act.sa_mask));
-       sigaddset(&(act.sa_mask), SIGCHLD);
-       sigaction(SIGCHLD, &act, NULL);
-       
        pid = fork();
 
        if(pid > 0) {
-    int status;
+               int status = 0;
                /* parent */
-               while(!(sigchld_received)) pause();
+               
+               ret = waitpid(pid, &status, 0);
+               if(ret == -1) {
+                       ret = errno;
+                       perror("Error in waitpid");
+                       goto start_error;
+               }
 
-    waitpid(pid, &status, 0);
-    ret = 0;
-    if(WIFEXITED(status))
-      ret = WEXITSTATUS(status);
-    if(ret) goto start_error;
+               ret = 0;
+               if(WIFEXITED(status))
+                       ret = WEXITSTATUS(status);
+               if(ret) goto start_error;
 
                printf("Creating supplementary trace files\n");
-    ret = create_eventdefs();
-    if(ret) goto start_error;
+               ret = create_eventdefs();
+               if(ret) goto start_error;
 
        } else if(pid == 0) {
                /* child */
-    int ret;
-    if(append_trace) 
-               ret =   execlp(lttd_path, lttd_path, "-t", trace_root, "-c",
-                       channel_path, "-d", "-a", "-N", num_threads, NULL);
-    else
-               ret =   execlp(lttd_path, lttd_path, "-t", trace_root, "-c",
-                       channel_path, "-d", "-N", num_threads, NULL);
+               int ret;
+               if(append_trace) 
+                       ret =   execlp(lttd_path, lttd_path, "-t", trace_root, "-c",
+                                                                                        channel_path, "-d", "-a", "-N", num_threads, NULL);
+               else
+                       ret =   execlp(lttd_path, lttd_path, "-t", trace_root, "-c",
+                                                                                        channel_path, "-d", "-N", num_threads, NULL);
                if(ret) {
-      ret = errno;
+                       ret = errno;
                        perror("Error in executing the lttd daemon");
                        exit(ret);
                }
@@ -453,7 +443,7 @@ int lttctl_daemon(struct lttctl_handle *handle, char *trace_name)
 
        /* error handling */
 start_error:
-  printf("Trace start error\n");
+       printf("Trace start error\n");
        ret |= lttctl_destroy_trace(handle, trace_name);
 create_error:
        return ret;
@@ -477,23 +467,23 @@ int main(int argc, char ** argv)
        if(handle == NULL) return -1;
        
        switch(op) {
-    case CTL_OP_CREATE_START:
+               case CTL_OP_CREATE_START:
                        ret = lttctl_create_trace(handle, trace_name, mode, trace_type, subbuf_size,
                                                                                                                                n_subbufs);
-      if(!ret)
-        ret = lttctl_start(handle, trace_name);
-      break;
-       case CTL_OP_CREATE:
+                       if(!ret)
+                               ret = lttctl_start(handle, trace_name);
+                       break;
+               case CTL_OP_CREATE:
                        ret = lttctl_create_trace(handle, trace_name, mode, trace_type, subbuf_size,
                                                                                                                                n_subbufs);
-      break;
+                       break;
                case CTL_OP_DESTROY:
                        ret = lttctl_destroy_trace(handle, trace_name);
                        break;
                case CTL_OP_STOP_DESTROY:
                        ret = lttctl_stop(handle, trace_name);
-      if(!ret)
-                       ret = lttctl_destroy_trace(handle, trace_name);
+                       if(!ret)
+                               ret = lttctl_destroy_trace(handle, trace_name);
                        break;
                case CTL_OP_START:
                        ret = lttctl_start(handle, trace_name);
@@ -504,9 +494,9 @@ int main(int argc, char ** argv)
                case CTL_OP_DAEMON:
                        ret = lttctl_daemon(handle, trace_name);
                        break;
-    case CTL_OP_DESCRIPTION:
-      ret = create_eventdefs();
-      break;
+               case CTL_OP_DESCRIPTION:
+                       ret = create_eventdefs();
+                       break;
                case CTL_OP_NONE:
                        break;
        }
This page took 0.031373 seconds and 4 git commands to generate.