projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
consumerd: tag metadata channel as being part of a live session
[lttng-tools.git]
/
src
/
common
/
kernel-consumer
/
kernel-consumer.c
diff --git
a/src/common/kernel-consumer/kernel-consumer.c
b/src/common/kernel-consumer/kernel-consumer.c
index 54314ec75a2c4d7758fd3c3ac2cd4d8492dee893..7032a7f7ffcc9bea224db0c6059f1928de72aa47 100644
(file)
--- a/
src/common/kernel-consumer/kernel-consumer.c
+++ b/
src/common/kernel-consumer/kernel-consumer.c
@@
-513,6
+513,7
@@
int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
msg.u.channel.tracefile_count, 0,
msg.u.channel.monitor,
msg.u.channel.live_timer_interval,
msg.u.channel.tracefile_count, 0,
msg.u.channel.monitor,
msg.u.channel.live_timer_interval,
+ msg.u.channel.is_live,
NULL, NULL);
if (new_channel == NULL) {
lttng_consumer_send_error(ctx, LTTCOMM_CONSUMERD_OUTFD_ERROR);
NULL, NULL);
if (new_channel == NULL) {
lttng_consumer_send_error(ctx, LTTCOMM_CONSUMERD_OUTFD_ERROR);
@@
-654,7
+655,9
@@
int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
health_code_update();
pthread_mutex_lock(&channel->lock);
health_code_update();
pthread_mutex_lock(&channel->lock);
- new_stream = consumer_allocate_stream(channel->key,
+ new_stream = consumer_allocate_stream(
+ channel,
+ channel->key,
fd,
channel->name,
channel->relayd_id,
fd,
channel->name,
channel->relayd_id,
@@
-676,7
+679,6
@@
int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
goto error_add_stream_nosignal;
}
goto error_add_stream_nosignal;
}
- new_stream->chan = channel;
new_stream->wait_fd = fd;
ret = kernctl_get_max_subbuf_size(new_stream->wait_fd,
&new_stream->max_sb_size);
new_stream->wait_fd = fd;
ret = kernctl_get_max_subbuf_size(new_stream->wait_fd,
&new_stream->max_sb_size);
This page took
0.027794 seconds
and
4
git commands to generate.