projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove extern C around probe header
[lttng-ust.git]
/
liblttng-ust
/
ltt-ring-buffer-metadata-client.h
diff --git
a/liblttng-ust/ltt-ring-buffer-metadata-client.h
b/liblttng-ust/ltt-ring-buffer-metadata-client.h
index 46aab3cce8d87d9300f2fcd032717e6a00cfd689..7e79b116fa613a672be0efaeb0a2c1987536c762 100644
(file)
--- a/
liblttng-ust/ltt-ring-buffer-metadata-client.h
+++ b/
liblttng-ust/ltt-ring-buffer-metadata-client.h
@@
-34,8
+34,7
@@
struct metadata_record_header {
static const struct lttng_ust_lib_ring_buffer_config client_config;
static const struct lttng_ust_lib_ring_buffer_config client_config;
-static inline
-u64 lib_ring_buffer_clock_read(struct channel *chan)
+static inline uint64_t lib_ring_buffer_clock_read(struct channel *chan)
{
return 0;
}
{
return 0;
}
@@
-51,7
+50,7
@@
unsigned char record_header_size(const struct lttng_ust_lib_ring_buffer_config *
#include "../libringbuffer/api.h"
#include "../libringbuffer/api.h"
-static u
64
client_ring_buffer_clock_read(struct channel *chan)
+static u
int64_t
client_ring_buffer_clock_read(struct channel *chan)
{
return 0;
}
{
return 0;
}
@@
-77,7
+76,7
@@
static size_t client_packet_header_size(void)
return offsetof(struct metadata_packet_header, header_end);
}
return offsetof(struct metadata_packet_header, 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)
{
@@
-106,7
+105,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)
{
@@
-168,8
+167,9
@@
struct ltt_channel *_channel_create(const char *name,
size_t subbuf_size, size_t num_subbuf,
unsigned int switch_timer_interval,
unsigned int read_timer_interval,
size_t subbuf_size, size_t num_subbuf,
unsigned int switch_timer_interval,
unsigned int read_timer_interval,
- int *shm_fd, int *wait_fd,
- uint64_t *memory_map_size)
+ int **shm_fd, int **wait_fd,
+ 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;
@@
-177,6
+177,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);
@@
-197,8
+198,8
@@
void ltt_channel_destroy(struct ltt_channel *ltt_chan)
static
struct lttng_ust_lib_ring_buffer *ltt_buffer_read_open(struct channel *chan,
struct lttng_ust_shm_handle *handle,
static
struct lttng_ust_lib_ring_buffer *ltt_buffer_read_open(struct channel *chan,
struct lttng_ust_shm_handle *handle,
- int *
shm_fd, int
*wait_fd,
- uint64_t *memory_map_size)
+ int *
*shm_fd, int *
*wait_fd,
+ uint64_t *
*
memory_map_size)
{
struct lttng_ust_lib_ring_buffer *buf;
{
struct lttng_ust_lib_ring_buffer *buf;
@@
-282,8
+283,8
@@
static
int ltt_flush_buffer(struct channel *chan, struct lttng_ust_shm_handle *handle)
{
struct lttng_ust_lib_ring_buffer *buf;
int ltt_flush_buffer(struct channel *chan, struct lttng_ust_shm_handle *handle)
{
struct lttng_ust_lib_ring_buffer *buf;
- int
shm_fd,
wait_fd;
- uint64_t memory_map_size;
+ int
*shm_fd, *
wait_fd;
+ uint64_t
*
memory_map_size;
buf = channel_get_ring_buffer(&client_config, chan,
0, handle, &shm_fd, &wait_fd,
buf = channel_get_ring_buffer(&client_config, chan,
0, handle, &shm_fd, &wait_fd,
This page took
0.02542 seconds
and
4
git commands to generate.