projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix UST renaming and update ust headers
[lttng-tools.git]
/
ltt-sessiond
/
kernel-ctl.c
diff --git
a/ltt-sessiond/kernel-ctl.c
b/ltt-sessiond/kernel-ctl.c
index e486fa10ada0002e8e2f7437ce677a0f24475ba6..203c01050e82199f34128d09b9c5dd95ca6fb0a4 100644
(file)
--- a/
ltt-sessiond/kernel-ctl.c
+++ b/
ltt-sessiond/kernel-ctl.c
@@
-122,7
+122,7
@@
int kernel_create_session(struct ltt_session *session, int tracer_fd)
perror("fcntl session fd");
}
perror("fcntl session fd");
}
- lks->
k
consumer_fds_sent = 0;
+ lks->consumer_fds_sent = 0;
session->kernel_session = lks;
DBG("Kernel session created (fd: %d)", lks->fd);
session->kernel_session = lks;
DBG("Kernel session created (fd: %d)", lks->fd);
@@
-189,12
+189,16
@@
int kernel_create_event(struct lttng_event *ev,
event = trace_kernel_create_event(ev);
if (event == NULL) {
event = trace_kernel_create_event(ev);
if (event == NULL) {
+ ret = -1;
goto error;
}
ret = kernctl_create_event(channel->fd, event->event);
if (ret < 0) {
goto error;
}
ret = kernctl_create_event(channel->fd, event->event);
if (ret < 0) {
- PERROR("create event ioctl");
+ if (errno != EEXIST) {
+ PERROR("create event ioctl");
+ }
+ ret = -errno;
goto free_event;
}
goto free_event;
}
@@
-226,7
+230,7
@@
end:
free_event:
free(event);
error:
free_event:
free(event);
error:
- return
-1
;
+ return
ret
;
}
/*
}
/*
This page took
0.026524 seconds
and
5
git commands to generate.