projects
/
lttv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
compile fixes
[lttv.git]
/
ltt
/
branches
/
poly
/
lttctl
/
lttctl.c
diff --git
a/ltt/branches/poly/lttctl/lttctl.c
b/ltt/branches/poly/lttctl/lttctl.c
index 080518d840ffb85ef6ec6c43e163a74f9fcc7937..105aacb61efb627cdb6a957e6f9cec0b30a73559 100644
(file)
--- a/
ltt/branches/poly/lttctl/lttctl.c
+++ b/
ltt/branches/poly/lttctl/lttctl.c
@@
-12,7
+12,7
@@
#include <config.h>
#endif
#include <config.h>
#endif
-#include <libltt
/libltt
.h>
+#include <libltt
ctl/lttctl
.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
@@
-25,7
+25,7
@@
#include <sys/stat.h>
/* Buffer for file copy : 4k seems optimal. */
#include <sys/stat.h>
/* Buffer for file copy : 4k seems optimal. */
-#define BUF_SIZE 4
194304
+#define BUF_SIZE 4
096
enum trace_ctl_op {
CTL_OP_CREATE_START,
enum trace_ctl_op {
CTL_OP_CREATE_START,
@@
-117,7
+117,7
@@
int parse_arguments(int argc, char **argv)
trace_name = argv[argn+1];
argn++;
} else {
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 = EINVAL;
}
printf("\n");
ret = EINVAL;
}
@@
-282,9
+282,9
@@
int create_eventdefs(void)
ret = mkdir(trace_root, S_IRWXU|S_IRWXG|S_IRWXO);
if(ret == -1 && errno != EEXIST) {
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);
perror("Cannot create trace_root directory");
printf("trace_root is %s\n", trace_root);
- ret = errno;
goto error;
}
ret = 0;
goto error;
}
ret = 0;
@@
-295,8
+295,8
@@
int create_eventdefs(void)
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)) {
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)) {
- perror("Cannot create eventdefs directory");
ret = errno;
ret = errno;
+ perror("Cannot create eventdefs directory");
goto error;
}
ret = 0;
goto error;
}
ret = 0;
@@
-327,8
+327,8
@@
int create_eventdefs(void)
strncat(facilities_file, entry->d_name, PATH_MAX - facilities_dir_len-1);
FILE *src = fopen(facilities_file, "r");
if(!src) {
strncat(facilities_file, entry->d_name, PATH_MAX - facilities_dir_len-1);
FILE *src = fopen(facilities_file, "r");
if(!src) {
- perror("Cannot open eventdefs file for reading");
ret = errno;
ret = errno;
+ perror("Cannot open eventdefs file for reading");
goto close_dest;
}
goto close_dest;
}
@@
-336,14
+336,14
@@
int create_eventdefs(void)
size_t read_size, write_size;
read_size = fread(read_buf, sizeof(char), BUF_SIZE, src);
if(ferror(src)) {
size_t read_size, write_size;
read_size = fread(read_buf, sizeof(char), BUF_SIZE, src);
if(ferror(src)) {
- perror("Cannot read eventdefs file");
ret = errno;
ret = errno;
+ perror("Cannot read eventdefs file");
goto close_src;
}
write_size = fwrite(read_buf, sizeof(char), read_size, dest);
if(ferror(dest)) {
goto close_src;
}
write_size = fwrite(read_buf, sizeof(char), read_size, dest);
if(ferror(dest)) {
- perror("Cannot write eventdefs file");
ret = errno;
ret = errno;
+ perror("Cannot write eventdefs file");
goto close_src;
}
} while(!feof(src));
goto close_src;
}
} while(!feof(src));
@@
-416,8
+416,9
@@
int lttctl_daemon(struct lttctl_handle *handle, char *trace_name)
ret = execlp(lttd_path, lttd_path, "-t", trace_root, "-c",
channel_path, "-d", NULL);
if(ret) {
ret = execlp(lttd_path, lttd_path, "-t", trace_root, "-c",
channel_path, "-d", NULL);
if(ret) {
+ ret = errno;
perror("Error in executing the lttd daemon");
perror("Error in executing the lttd daemon");
- exit(
errno
);
+ exit(
ret
);
}
} else {
/* error */
}
} else {
/* error */
This page took
0.025347 seconds
and
4
git commands to generate.