projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove dependency on kallsyms for irq_to_desc (kernel 3.4+)
[lttng-modules.git]
/
lttng-ring-buffer-client.h
diff --git
a/lttng-ring-buffer-client.h
b/lttng-ring-buffer-client.h
index 7c9ae443419926433796ec79df5a6709c5398e84..8916ab0239a537215a310f05acf1b99c8ef97ff2 100644
(file)
--- a/
lttng-ring-buffer-client.h
+++ b/
lttng-ring-buffer-client.h
@@
-464,9
+464,10
@@
static int client_stream_id(const struct lib_ring_buffer_config *config,
struct lib_ring_buffer *buf,
uint64_t *stream_id)
{
struct lib_ring_buffer *buf,
uint64_t *stream_id)
{
- struct
packet_header *header = client_packet_header(config, buf)
;
-
*stream_id = header->stream_id
;
+ struct
channel *chan = buf->backend.chan
;
+
struct lttng_channel *lttng_chan = channel_get_private(chan)
;
+ *stream_id = lttng_chan->id;
return 0;
}
return 0;
}
@@
-495,8
+496,7
@@
int client_instance_id(const struct lib_ring_buffer_config *config,
struct lib_ring_buffer *buf,
uint64_t *id)
{
struct lib_ring_buffer *buf,
uint64_t *id)
{
- struct packet_header *header = client_packet_header(config, buf);
- *id = header->stream_instance_id;
+ *id = buf->backend.cpu;
return 0;
}
return 0;
}
@@
-606,7
+606,7
@@
int lttng_event_reserve(struct lib_ring_buffer_ctx *ctx,
int ret, cpu;
cpu = lib_ring_buffer_get_cpu(&client_config);
int ret, cpu;
cpu = lib_ring_buffer_get_cpu(&client_config);
- if (
cpu < 0
)
+ if (
unlikely(cpu < 0)
)
return -EPERM;
ctx->cpu = cpu;
return -EPERM;
ctx->cpu = cpu;
@@
-624,8
+624,10
@@
int lttng_event_reserve(struct lib_ring_buffer_ctx *ctx,
}
ret = lib_ring_buffer_reserve(&client_config, ctx);
}
ret = lib_ring_buffer_reserve(&client_config, ctx);
- if (
ret
)
+ if (
unlikely(ret)
)
goto put;
goto put;
+ lib_ring_buffer_backend_get_pages(&client_config, ctx,
+ &ctx->backend_pages);
lttng_write_event_header(&client_config, ctx, event_id);
return 0;
put:
lttng_write_event_header(&client_config, ctx, event_id);
return 0;
put:
This page took
0.023264 seconds
and
4
git commands to generate.