projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: metadata stream should not reference session
[lttng-modules.git]
/
lttng-events.c
diff --git
a/lttng-events.c
b/lttng-events.c
index 567df65acea12345f51e46c937efa5f95cb15202..4b891cd5ecda22e8778f5a4592f19c9e2574172f 100644
(file)
--- a/
lttng-events.c
+++ b/
lttng-events.c
@@
-554,8
+554,8
@@
void _lttng_event_destroy(struct lttng_event *event)
* remaining space left in packet and write, since mutual exclusion
* protects us from concurrent writes.
*/
* remaining space left in packet and write, since mutual exclusion
* protects us from concurrent writes.
*/
-int lttng_metadata_output_channel(struct lttng_
channel *chan
,
- struct
lttng_metadata_stream *stream
)
+int lttng_metadata_output_channel(struct lttng_
metadata_stream *stream
,
+ struct
channel *chan
)
{
struct lib_ring_buffer_ctx ctx;
int ret = 0;
{
struct lib_ring_buffer_ctx ctx;
int ret = 0;
@@
-574,22
+574,22
@@
int lttng_metadata_output_channel(struct lttng_channel *chan,
if (!len)
return 0;
reserve_len = min_t(size_t,
if (!len)
return 0;
reserve_len = min_t(size_t,
-
chan->ops->packet_avail_size(chan->
chan),
+
stream->transport->ops.packet_avail_size(
chan),
len);
len);
- lib_ring_buffer_ctx_init(&ctx, chan
->chan
, NULL, reserve_len,
+ lib_ring_buffer_ctx_init(&ctx, chan, NULL, reserve_len,
sizeof(char), -1);
/*
* If reservation failed, return an error to the caller.
*/
sizeof(char), -1);
/*
* If reservation failed, return an error to the caller.
*/
- ret =
chan->ops->
event_reserve(&ctx, 0);
+ ret =
stream->transport->ops.
event_reserve(&ctx, 0);
if (ret != 0) {
printk(KERN_WARNING "LTTng: Metadata event reservation failed\n");
goto end;
}
if (ret != 0) {
printk(KERN_WARNING "LTTng: Metadata event reservation failed\n");
goto end;
}
-
chan->ops->
event_write(&ctx,
+
stream->transport->ops.
event_write(&ctx,
stream->metadata_cache->data + stream->metadata_in,
reserve_len);
stream->metadata_cache->data + stream->metadata_in,
reserve_len);
-
chan->ops->
event_commit(&ctx);
+
stream->transport->ops.
event_commit(&ctx);
stream->metadata_in += reserve_len;
ret = reserve_len;
stream->metadata_in += reserve_len;
ret = reserve_len;
This page took
0.024263 seconds
and
4
git commands to generate.