#include <config.h>
#endif
-#include <libltt/libltt.h>
+#include <liblttctl/lttctl.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
+#include <sys/wait.h>
#include <unistd.h>
#include <signal.h>
#include <dirent.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 char *mode_name = NULL;
static unsigned subbuf_size = 0;
static unsigned n_subbufs = 0;
+static unsigned append_trace = 0;
static enum trace_mode mode = LTT_TRACE_NORMAL;
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 sigio_received = 0;
+static int sigchld_received = 0;
-void handler(int signo)
+void sigchld_handler(int signo)
{
printf("signal %d received\n", signo);
- sigio_received = 1;
+ sigchld_received = 1;
}
printf("-z Size of the subbuffers (will be rounded to next page size)\n");
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;
}
}
struct dirent *entry;
char *facilities_path = getenv("LTT_FACILITIES");
if(facilities_path == NULL) facilities_path =
- "/usr/share/LinuxTraceToolkitViewer/facilities";
+ 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;
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 && errno != EEXIST) {
+ if(ret == -1 && (!append_trace || errno != EEXIST)) {
+ ret = errno;
perror("Cannot create eventdefs directory");
goto error;
}
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;
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;
}
closedir(facilities_dir);
- error:
+error:
return ret;
}
char *lttd_path = getenv("LTT_DAEMON");
struct sigaction act;
- if(lttd_path == NULL) lttd_path = "lttd";
+ if(lttd_path == NULL) lttd_path =
+ PACKAGE_BIN_DIR "/lttd";
strcat(channel_path, channel_root);
strcat(channel_path, "/");
ret = lttctl_create_trace(handle, trace_name, mode, subbuf_size, n_subbufs);
if(ret != 0) goto create_error;
- act.sa_handler = handler;
+ act.sa_handler = sigchld_handler;
sigemptyset(&(act.sa_mask));
- sigaddset(&(act.sa_mask), SIGIO);
- sigaction(SIGIO, &act, NULL);
-
- sigio_received = 0;
+ sigaddset(&(act.sa_mask), SIGCHLD);
+ sigaction(SIGCHLD, &act, NULL);
pid = fork();
if(pid > 0) {
+ int status;
/* parent */
- while(!sigio_received) pause();
+ while(!(sigchld_received)) pause();
+
+ waitpid(pid, &status, 0);
+ ret = 0;
+ if(WIFEXITED(status))
+ ret = WEXITSTATUS(status);
+ if(ret) goto start_error;
- /* Now the trace is created, go on and create the supplementary files... */
-
printf("Creating supplementary trace files\n");
ret = create_eventdefs();
if(ret) goto start_error;
} else if(pid == 0) {
/* child */
- int ret =
- execlp(lttd_path, lttd_path, "-t", trace_root, "-c", channel_path, "-s", 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;
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);
/* error handling */
start_error:
+ printf("Trace start error\n");
ret |= lttctl_destroy_trace(handle, trace_name);
create_error:
return ret;
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();
projects / lttv.git / blobdiff