#include <config.h>
#endif
-#include <libltt/libltt.h>
+#include <liblttctl/lttctl.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/stat.h>
/* Buffer for file copy : 4k seems optimal. */
-#define BUF_SIZE 4194304
+#define BUF_SIZE 4096
enum trace_ctl_op {
CTL_OP_CREATE_START,
static enum trace_ctl_op op = CTL_OP_NONE;
static char *channel_root = NULL;
static char *trace_root = NULL;
+static char *num_threads = "1";
static int sigchld_received = 0;
printf("-x Number of subbuffers\n");
printf("-e Get XML facilities description\n");
printf("-a Append to trace\n");
+ printf("-N Number of lttd threads\n");
printf("\n");
}
*
* Parses the command line arguments.
*
- * Returns 1 if the arguments were correct, but doesn't ask for program
- * continuation. Returns -1 if the arguments are incorrect, or 0 if OK.
+ * Returns -1 if the arguments were correct, but doesn't ask for program
+ * continuation. Returns EINVAL if the arguments are incorrect, or 0 if OK.
*/
int parse_arguments(int argc, char **argv)
{
if(argc == 2) {
if(strcmp(argv[1], "-h") == 0) {
- return 1;
+ return -1;
}
}
trace_name = argv[argn+1];
argn++;
} else {
- printf("Specify a trace name after -n.\n", argv[argn]);
+ printf("Specify a trace name after -n.\n");
printf("\n");
- ret = -1;
+ ret = EINVAL;
}
break;
case 'b':
op = CTL_OP_CREATE_START;
+ break;
case 'c':
op = CTL_OP_CREATE;
break;
else {
printf("Invalid mode '%s'.\n", argv[argn]);
printf("\n");
- ret = -1;
+ ret = EINVAL;
}
} else {
printf("Specify a mode after -m.\n");
printf("\n");
- ret = -1;
+ ret = EINVAL;
}
break;
case 'r':
} else {
printf("Specify a number of subbuffers after -z.\n");
printf("\n");
- ret = -1;
+ ret = EINVAL;
}
break;
case 'x':
} else {
printf("Specify a subbuffer size after -x.\n");
printf("\n");
- ret = -1;
+ ret = EINVAL;
}
break;
case 'd':
} else {
printf("Specify a trace root path after -t.\n");
printf("\n");
- ret = -1;
+ ret = EINVAL;
}
break;
case 'l':
} else {
printf("Specify a channel root path after -l.\n");
printf("\n");
- ret = -1;
+ ret = EINVAL;
}
break;
case 'a':
append_trace = 1;
break;
+ case 'N':
+ if(argn+1 < argc) {
+ num_threads = argv[argn+1];
+ argn++;
+ }
+ break;
default:
printf("Invalid argument '%s'.\n", argv[argn]);
printf("\n");
- ret = -1;
+ ret = EINVAL;
}
break;
default:
printf("Invalid argument '%s'.\n", argv[argn]);
printf("\n");
- ret = -1;
+ ret = EINVAL;
}
argn++;
}
if(op != CTL_OP_DESCRIPTION && trace_name == NULL) {
printf("Please specify a trace name.\n");
printf("\n");
- ret = -1;
+ ret = EINVAL;
}
if(op == CTL_OP_NONE) {
printf("Please specify an operation.\n");
printf("\n");
- ret = -1;
+ ret = EINVAL;
}
if(op == CTL_OP_DAEMON) {
if(trace_root == NULL) {
printf("Please specify -t trace_root_path with the -d option.\n");
printf("\n");
- ret = -1;
+ ret = EINVAL;
}
if(channel_root == NULL) {
printf("Please specify -l ltt_root_path with the -d option.\n");
printf("\n");
- ret = -1;
+ ret = EINVAL;
}
}
if(trace_root == NULL) {
printf("Please specify -t trace_root_path with the -e option.\n");
printf("\n");
- ret = -1;
+ ret = EINVAL;
}
}
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;
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;
}
if(facilities_dir == NULL) {
perror("Cannot open facilities directory");
- ret = -1;
+ ret = EEXIST;
goto error;
}
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;
}
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;
}
int ret;
if(append_trace)
ret = execlp(lttd_path, lttd_path, "-t", trace_root, "-c",
- channel_path, "-d", "-a", NULL);
+ channel_path, "-d", "-a", "-N", num_threads, NULL);
else
ret = execlp(lttd_path, lttd_path, "-t", trace_root, "-c",
- channel_path, "-d", NULL);
+ channel_path, "-d", "-N", num_threads, NULL);
if(ret) {
+ ret = errno;
perror("Error in executing the lttd daemon");
- exit(-1);
+ exit(ret);
}
} else {
/* error */
perror("Error in forking for lttd daemon");
-
}
ret = lttctl_start(handle, trace_name);
ret = parse_arguments(argc, argv);
if(ret != 0) show_arguments();
- if(ret < 0) return EINVAL;
- if(ret > 0) return 0;
+ if(ret == EINVAL) return EINVAL;
+ if(ret == -1) return 0;
show_info();