UST consumer: perform buffer flush on hang up

[lttng-tools.git] / include / lttng / lttng-consumer.h

diff --git a/include/lttng/lttng-consumer.h b/include/lttng/lttng-consumer.h
index a0277cf042bddd5fc561a31864fceb8e243897bf..6f893a53a67a3d01095c2221a09850e086675b85 100644 (file)
--- a/include/lttng/lttng-consumer.h
+++ b/include/lttng/lttng-consumer.h
@@ -83,6 +83,9 @@ struct lttng_consumer_channel {
        size_t mmap_len;
        struct lttng_ust_shm_handle *handle;
        int nr_streams;
+       int shm_fd_is_copy;
+       int wait_fd_is_copy;
+       int cpucount;
 };
 
 /* Forward declaration for UST. */
@@ -110,9 +113,12 @@ struct lttng_consumer_stream {
        void *mmap_base;
        size_t mmap_len;
        enum lttng_event_output output; /* splice or mmap */
+       int shm_fd_is_copy;
+       int wait_fd_is_copy;
        /* For UST */
        struct lttng_ust_lib_ring_buffer *buf;
        int cpu;
+       int hangup_flush_done;
 };
 
 /*
@@ -121,7 +127,8 @@ struct lttng_consumer_stream {
  */
 struct lttng_consumer_local_data {
        /* function to call when data is available on a buffer */
-       int (*on_buffer_ready)(struct lttng_consumer_stream *stream);
+       int (*on_buffer_ready)(struct lttng_consumer_stream *stream,
+                       struct lttng_consumer_local_data *ctx);
        /*
         * function to call when we receive a new channel, it receives a
         * newly allocated channel, depending on the return code of this
@@ -272,7 +279,8 @@ int consumer_add_channel(struct lttng_consumer_channel *channel);
 
 extern struct lttng_consumer_local_data *lttng_consumer_create(
                enum lttng_consumer_type type,
-               int (*buffer_ready)(struct lttng_consumer_stream *stream),
+               int (*buffer_ready)(struct lttng_consumer_stream *stream,
+                       struct lttng_consumer_local_data *ctx),
                int (*recv_channel)(struct lttng_consumer_channel *channel),
                int (*recv_stream)(struct lttng_consumer_stream *stream),
                int (*update_stream)(int sessiond_key, uint32_t state));
@@ -294,4 +302,8 @@ extern void *lttng_consumer_thread_receive_fds(void *data);
 extern int lttng_consumer_recv_cmd(struct lttng_consumer_local_data *ctx,
                int sock, struct pollfd *consumer_sockpoll);
 
+int lttng_consumer_read_subbuffer(struct lttng_consumer_stream *stream,
+               struct lttng_consumer_local_data *ctx);
+int lttng_consumer_on_recv_stream(struct lttng_consumer_stream *stream);
+
 #endif /* _LTTNG_CONSUMER_H */