projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update TODO
[lttng-ust.git]
/
ustd
/
ustd.c
diff --git
a/ustd/ustd.c
b/ustd/ustd.c
index bfa6352e1ccf2b4063660ff279b007f29ec3702a..969c192abdb66bea7b9ce93dd48d7a994b5fe70c 100644
(file)
--- a/
ustd/ustd.c
+++ b/
ustd/ustd.c
@@
-259,7
+259,7
@@
struct buffer_info *connect_buffer(pid_t pid, const char *bufname)
result = sscanf(received_msg, "%d %d", &buf->shmid, &buf->bufstruct_shmid);
if(result != 2) {
result = sscanf(received_msg, "%d %d", &buf->shmid, &buf->bufstruct_shmid);
if(result != 2) {
- ERR("unable to parse response to get_shmid
"
);
+ ERR("unable to parse response to get_shmid
(\"%s\")", received_msg
);
return NULL;
}
free(received_msg);
return NULL;
}
free(received_msg);
@@
-342,7
+342,7
@@
struct buffer_info *connect_buffer(pid_t pid, const char *bufname)
}
free(tmp);
}
free(tmp);
- asprintf(&tmp, "%s/%u_%lld/%s
_0
", trace_path, buf->pid, buf->pidunique, buf->name);
+ asprintf(&tmp, "%s/%u_%lld/%s", trace_path, buf->pid, buf->pidunique, buf->name);
result = fd = open(tmp, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 00600);
if(result == -1) {
PERROR("open");
result = fd = open(tmp, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 00600);
if(result == -1) {
PERROR("open");
@@
-545,7
+545,7
@@
static int write_pidfile(const char *file_name, pid_t pid)
{
FILE *pidfp;
{
FILE *pidfp;
- pidfp = fopen(file_name, "w
+
");
+ pidfp = fopen(file_name, "w");
if(!pidfp) {
PERROR("fopen (%s)", pidfile);
WARN("killing child process");
if(!pidfp) {
PERROR("fopen (%s)", pidfile);
WARN("killing child process");
@@
-698,7
+698,6
@@
int start_ustd_daemon()
}
else {
char buf;
}
else {
char buf;
- FILE *pidfp;
result = read(fd[0], &buf, 1);
if(result == -1) {
result = read(fd[0], &buf, 1);
if(result == -1) {
This page took
0.0237579999999999 seconds
and
4
git commands to generate.