X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=libringbuffer%2Ffrontend.h;h=2a9fd09af2dd9cf7e17395ddf106ce9e66065436;hb=3ff7660f2ce6362de87a48bc45c9a98b9c785472;hp=89613d4cc64823a943ad3f42d17be83e0140d3c9;hpb=ff0f57289ff0e6be25424081fabbbfc0e3b1b565;p=lttng-ust.git

diff --git a/libringbuffer/frontend.h b/libringbuffer/frontend.h
index 89613d4c..2a9fd09a 100644
--- a/libringbuffer/frontend.h
+++ b/libringbuffer/frontend.h
@@ -64,7 +64,9 @@ struct lttng_ust_shm_handle *channel_create(const struct lttng_ust_lib_ring_buff
 				void *buf_addr,
 				size_t subbuf_size, size_t num_subbuf,
 				unsigned int switch_timer_interval,
-				unsigned int read_timer_interval);
+				unsigned int read_timer_interval,
+				const int *stream_fds, int nr_stream_fds,
+				int64_t blocking_timeout);
 
 /*
  * channel_destroy finalizes all channel's buffers, waits for readers to
@@ -130,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);
+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);
@@ -161,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)
 {
+	struct channel *chan;
+
+	chan = shmp(handle, buf->backend.chan);
+	if (!chan)
+		return;
 	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);