projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: Move headers from toplevel to include/lttng/
[lttng-modules.git]
/
lttng-ring-buffer-client.h
diff --git
a/lttng-ring-buffer-client.h
b/lttng-ring-buffer-client.h
index dc3356e4d286f2c2d190d9816d4ab34f2eb65b84..aad7955f8accfcdea845b14858b431adab3cf69c 100644
(file)
--- a/
lttng-ring-buffer-client.h
+++ b/
lttng-ring-buffer-client.h
@@
-1,4
+1,4
@@
-/* SPDX-License-Identifier: (GPL-2.0
or LGPL-2.1
)
+/* SPDX-License-Identifier: (GPL-2.0
-only or LGPL-2.1-only
)
*
* lttng-ring-buffer-client.h
*
*
* lttng-ring-buffer-client.h
*
@@
-9,12
+9,12
@@
#include <linux/module.h>
#include <linux/types.h>
#include <linux/module.h>
#include <linux/types.h>
-#include <l
ib
/bitfield.h>
-#include <wrapper/vmalloc.h> /* for wrapper_vmalloc_sync_
all
() */
+#include <l
ttng
/bitfield.h>
+#include <wrapper/vmalloc.h> /* for wrapper_vmalloc_sync_
mappings
() */
#include <wrapper/trace-clock.h>
#include <wrapper/trace-clock.h>
-#include <lttng
-
events.h>
-#include <lttng
-
tracer.h>
-#include <
wrapper/
ringbuffer/frontend_types.h>
+#include <lttng
/
events.h>
+#include <lttng
/
tracer.h>
+#include <ringbuffer/frontend_types.h>
#define LTTNG_COMPACT_EVENT_BITS 5
#define LTTNG_COMPACT_TSC_BITS 27
#define LTTNG_COMPACT_EVENT_BITS 5
#define LTTNG_COMPACT_TSC_BITS 27
@@
-191,7
+191,7
@@
size_t record_header_size(const struct lib_ring_buffer_config *config,
return offset - orig_offset;
}
return offset - orig_offset;
}
-#include <
wrapper/
ringbuffer/api.h>
+#include <ringbuffer/api.h>
static
void lttng_write_event_header_slow(const struct lib_ring_buffer_config *config,
static
void lttng_write_event_header_slow(const struct lib_ring_buffer_config *config,
@@
-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.024171 seconds
and
4
git commands to generate.