projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge rculfhash into lttng-tools
[lttng-tools.git]
/
ltt-sessiond
/
kernel-ctl.c
diff --git
a/ltt-sessiond/kernel-ctl.c
b/ltt-sessiond/kernel-ctl.c
index d088115f78380cddc15e1f038b1980ffa16ed4b1..b66f08cb3fd354d00f15a3abd85d8dfa21462371 100644
(file)
--- a/
ltt-sessiond/kernel-ctl.c
+++ b/
ltt-sessiond/kernel-ctl.c
@@
-102,7
+102,7
@@
int kernel_create_session(struct ltt_session *session, int tracer_fd)
struct ltt_kernel_session *lks;
/* Allocate data structure */
struct ltt_kernel_session *lks;
/* Allocate data structure */
- lks = trace_kernel_create_session();
+ lks = trace_kernel_create_session(
session->path
);
if (lks == NULL) {
ret = -1;
goto error;
if (lks == NULL) {
ret = -1;
goto error;
@@
-250,9
+250,8
@@
int kernel_enable_channel(struct ltt_kernel_channel *chan)
int ret;
ret = kernctl_enable(chan->fd);
int ret;
ret = kernctl_enable(chan->fd);
- if (ret < 0) {
- perror("enable chan ioctl");
- ret = errno;
+ if (ret < 0 && errno != EEXIST) {
+ perror("Enable kernel chan");
goto error;
}
goto error;
}
@@
-273,11
+272,8
@@
int kernel_enable_event(struct ltt_kernel_event *event)
int ret;
ret = kernctl_enable(event->fd);
int ret;
ret = kernctl_enable(event->fd);
- if (ret < 0) {
- perror("enable event ioctl");
- if (errno == EEXIST) {
- ret = -EEXIST;
- }
+ if (ret < 0 && errno != EEXIST) {
+ perror("enable kernel event");
goto error;
}
goto error;
}
@@
-298,8
+294,8
@@
int kernel_disable_event(struct ltt_kernel_event *event)
int ret;
ret = kernctl_disable(event->fd);
int ret;
ret = kernctl_disable(event->fd);
- if (ret < 0) {
- perror("disable
event ioctl
");
+ if (ret < 0
&& errno != EEXIST
) {
+ perror("disable
kernel event
");
goto error;
}
goto error;
}
This page took
0.025477 seconds
and
4
git commands to generate.