projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update version to 1.9.2
[lttng-ust.git]
/
liblttng-ust
/
ltt-ring-buffer-client.h
diff --git
a/liblttng-ust/ltt-ring-buffer-client.h
b/liblttng-ust/ltt-ring-buffer-client.h
index abbaf705282b7e07655dd26e6c2f17f3d0703f05..6f714da57b97866d842dd10beafb7836cb2b0550 100644
(file)
--- a/
liblttng-ust/ltt-ring-buffer-client.h
+++ b/
liblttng-ust/ltt-ring-buffer-client.h
@@
-11,7
+11,7
@@
#include <stdint.h>
#include <lttng/ust-events.h>
#include "lttng/bitfield.h"
#include <stdint.h>
#include <lttng/ust-events.h>
#include "lttng/bitfield.h"
-#include "
lttng/
clock.h"
+#include "clock.h"
#include "ltt-tracer.h"
#include "../libringbuffer/frontend_types.h"
#include "ltt-tracer.h"
#include "../libringbuffer/frontend_types.h"
@@
-48,7
+48,7
@@
struct packet_header {
};
};
-static inline
notrace u64
lib_ring_buffer_clock_read(struct channel *chan)
+static inline
uint64_t
lib_ring_buffer_clock_read(struct channel *chan)
{
return trace_clock_read64();
}
{
return trace_clock_read64();
}
@@
-267,7
+267,7
@@
void ltt_write_event_header_slow(const struct lttng_ust_lib_ring_buffer_config *
static const struct lttng_ust_lib_ring_buffer_config client_config;
static const struct lttng_ust_lib_ring_buffer_config client_config;
-static u
64
client_ring_buffer_clock_read(struct channel *chan)
+static u
int64_t
client_ring_buffer_clock_read(struct channel *chan)
{
return lib_ring_buffer_clock_read(chan);
}
{
return lib_ring_buffer_clock_read(chan);
}
@@
-294,7
+294,7
@@
static size_t client_packet_header_size(void)
return offsetof(struct packet_header, ctx.header_end);
}
return offsetof(struct packet_header, ctx.header_end);
}
-static void client_buffer_begin(struct lttng_ust_lib_ring_buffer *buf, u
64
tsc,
+static void client_buffer_begin(struct lttng_ust_lib_ring_buffer *buf, u
int64_t
tsc,
unsigned int subbuf_idx,
struct lttng_ust_shm_handle *handle)
{
unsigned int subbuf_idx,
struct lttng_ust_shm_handle *handle)
{
@@
-321,7
+321,7
@@
static void client_buffer_begin(struct lttng_ust_lib_ring_buffer *buf, u64 tsc,
* offset is assumed to never be 0 here : never deliver a completely empty
* subbuffer. data_size is between 1 and subbuf_size.
*/
* offset is assumed to never be 0 here : never deliver a completely empty
* subbuffer. data_size is between 1 and subbuf_size.
*/
-static void client_buffer_end(struct lttng_ust_lib_ring_buffer *buf, u
64
tsc,
+static void client_buffer_end(struct lttng_ust_lib_ring_buffer *buf, u
int64_t
tsc,
unsigned int subbuf_idx, unsigned long data_size,
struct lttng_ust_shm_handle *handle)
{
unsigned int subbuf_idx, unsigned long data_size,
struct lttng_ust_shm_handle *handle)
{
@@
-386,7
+386,8
@@
struct ltt_channel *_channel_create(const char *name,
unsigned int switch_timer_interval,
unsigned int read_timer_interval,
int *shm_fd, int *wait_fd,
unsigned int switch_timer_interval,
unsigned int read_timer_interval,
int *shm_fd, int *wait_fd,
- uint64_t *memory_map_size)
+ uint64_t *memory_map_size,
+ struct ltt_channel *chan_priv_init)
{
void *priv;
struct ltt_channel *ltt_chan = NULL;
{
void *priv;
struct ltt_channel *ltt_chan = NULL;
@@
-394,6
+395,7
@@
struct ltt_channel *_channel_create(const char *name,
handle = channel_create(&client_config, name,
&priv, __alignof__(*ltt_chan), sizeof(*ltt_chan),
handle = channel_create(&client_config, name,
&priv, __alignof__(*ltt_chan), sizeof(*ltt_chan),
+ chan_priv_init,
buf_addr, subbuf_size, num_subbuf,
switch_timer_interval, read_timer_interval,
shm_fd, wait_fd, memory_map_size);
buf_addr, subbuf_size, num_subbuf,
switch_timer_interval, read_timer_interval,
shm_fd, wait_fd, memory_map_size);
This page took
0.024621 seconds
and
4
git commands to generate.