projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
consumerd: pass channel instance to stream creation function
[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..5aec4ecf8bdb856b4b2c5fb41b6d79e1c269dcf9 100644
(file)
--- a/
src/common/kernel-consumer/kernel-consumer.c
+++ b/
src/common/kernel-consumer/kernel-consumer.c
@@
-654,7
+654,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
+678,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.023784 seconds
and
4
git commands to generate.