projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ust consumer: flag shm/wait fd as copy
[lttng-tools.git]
/
liblttng-ustconsumer
/
lttng-ustconsumer.c
diff --git
a/liblttng-ustconsumer/lttng-ustconsumer.c
b/liblttng-ustconsumer/lttng-ustconsumer.c
index 951ef78812e3661980bc95b7a3b31674969146e5..db0ba05bd6a160c691b77eff6fe8808a2032dd45 100644
(file)
--- a/
liblttng-ustconsumer/lttng-ustconsumer.c
+++ b/
liblttng-ustconsumer/lttng-ustconsumer.c
@@
-29,9
+29,9
@@
#include <sys/types.h>
#include <unistd.h>
#include <sys/types.h>
#include <unistd.h>
-#include <ust/lttng-ust-ctl.h>
#include <lttng-sessiond-comm.h>
#include <lttng/lttng-ustconsumer.h>
#include <lttng-sessiond-comm.h>
#include <lttng/lttng-ustconsumer.h>
+#include <lttng/ust-ctl.h>
#include <lttngerr.h>
extern struct lttng_consumer_global_data consumer_data;
#include <lttngerr.h>
extern struct lttng_consumer_global_data consumer_data;
@@
-271,6
+271,12
@@
int lttng_ustconsumer_allocate_channel(struct lttng_consumer_channel *chan)
if (!chan->handle) {
return -ENOMEM;
}
if (!chan->handle) {
return -ENOMEM;
}
+ /*
+ * The channel fds are passed to ustctl, we only keep a copy.
+ */
+ chan->shm_fd_is_copy = 1;
+ chan->wait_fd_is_copy = 1;
+
return 0;
}
return 0;
}
@@
-298,6
+304,12
@@
int lttng_ustconsumer_allocate_stream(struct lttng_consumer_stream *stream)
if (!stream->mmap_base) {
return -EINVAL;
}
if (!stream->mmap_base) {
return -EINVAL;
}
+ /*
+ * The stream fds are passed to ustctl, we only keep a copy.
+ */
+ stream->shm_fd_is_copy = 1;
+ stream->wait_fd_is_copy = 1;
+
return 0;
}
return 0;
}
This page took
0.024789 seconds
and
4
git commands to generate.