projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
compat: work around broken _SC_NPROCESSORS_CONF on MUSL libc
[lttng-ust.git]
/
libringbuffer
/
frontend.h
diff --git
a/libringbuffer/frontend.h
b/libringbuffer/frontend.h
index 8c8517086828d1fc5c9cf2bf2c780b8a933fc653..2a9fd09af2dd9cf7e17395ddf106ce9e66065436 100644
(file)
--- a/
libringbuffer/frontend.h
+++ b/
libringbuffer/frontend.h
@@
-65,7
+65,8
@@
struct lttng_ust_shm_handle *channel_create(const struct lttng_ust_lib_ring_buff
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,
- const int *stream_fds, int nr_stream_fds);
+ const int *stream_fds, int nr_stream_fds,
+ int64_t blocking_timeout);
/*
* channel_destroy finalizes all channel's buffers, waits for readers to
/*
* channel_destroy finalizes all channel's buffers, waits for readers to
@@
-131,6
+132,11
@@
extern int lib_ring_buffer_snapshot(struct lttng_ust_lib_ring_buffer *buf,
unsigned long *consumed,
unsigned long *produced,
struct lttng_ust_shm_handle *handle);
unsigned long *consumed,
unsigned long *produced,
struct lttng_ust_shm_handle *handle);
+extern int lib_ring_buffer_snapshot_sample_positions(
+ struct lttng_ust_lib_ring_buffer *buf,
+ unsigned long *consumed,
+ unsigned long *produced,
+ struct lttng_ust_shm_handle *handle);
extern void lib_ring_buffer_move_consumer(struct lttng_ust_lib_ring_buffer *buf,
unsigned long consumed_new,
struct lttng_ust_shm_handle *handle);
extern void lib_ring_buffer_move_consumer(struct lttng_ust_lib_ring_buffer *buf,
unsigned long consumed_new,
struct lttng_ust_shm_handle *handle);
@@
-162,9
+168,14
@@
static inline
void lib_ring_buffer_put_next_subbuf(struct lttng_ust_lib_ring_buffer *buf,
struct lttng_ust_shm_handle *handle)
{
void lib_ring_buffer_put_next_subbuf(struct lttng_ust_lib_ring_buffer *buf,
struct lttng_ust_shm_handle *handle)
{
+ struct channel *chan;
+
+ chan = shmp(handle, buf->backend.chan);
+ if (!chan)
+ return;
lib_ring_buffer_put_subbuf(buf, handle);
lib_ring_buffer_put_subbuf(buf, handle);
- lib_ring_buffer_move_consumer(buf, subbuf_align(buf->cons_snapshot,
-
shmp(handle, buf->backend.chan)),
handle);
+ lib_ring_buffer_move_consumer(buf, subbuf_align(buf->cons_snapshot,
chan),
+ handle);
}
extern void channel_reset(struct channel *chan);
}
extern void channel_reset(struct channel *chan);
This page took
0.025923 seconds
and
4
git commands to generate.