projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 2.12.14
[lttng-modules.git]
/
lttng-ring-buffer-client.h
diff --git
a/lttng-ring-buffer-client.h
b/lttng-ring-buffer-client.h
index dc3356e4d286f2c2d190d9816d4ab34f2eb65b84..ff6283087d6176bb87763a85c0a9e3fc5853c9f4 100644
(file)
--- a/
lttng-ring-buffer-client.h
+++ b/
lttng-ring-buffer-client.h
@@
-10,7
+10,7
@@
#include <linux/module.h>
#include <linux/types.h>
#include <lib/bitfield.h>
#include <linux/module.h>
#include <linux/types.h>
#include <lib/bitfield.h>
-#include <wrapper/vmalloc.h> /* for wrapper_vmalloc_sync_
all
() */
+#include <wrapper/vmalloc.h> /* for wrapper_vmalloc_sync_
mappings
() */
#include <wrapper/trace-clock.h>
#include <lttng-events.h>
#include <lttng-tracer.h>
#include <wrapper/trace-clock.h>
#include <lttng-events.h>
#include <lttng-tracer.h>
@@
-479,9
+479,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;
}
@@
-510,8
+511,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;
}
@@
-766,7
+766,7
@@
static int __init lttng_ring_buffer_client_init(void)
* This vmalloc sync all also takes care of the lib ring buffer
* vmalloc'd module pages when it is built as a module into LTTng.
*/
* This vmalloc sync all also takes care of the lib ring buffer
* vmalloc'd module pages when it is built as a module into LTTng.
*/
- wrapper_vmalloc_sync_
all
();
+ wrapper_vmalloc_sync_
mappings
();
lttng_transport_register(<tng_relay_transport);
return 0;
}
lttng_transport_register(<tng_relay_transport);
return 0;
}
This page took
0.023695 seconds
and
4
git commands to generate.