/*
* When the receiving thread dies, we need to have a way to make the polling
* thread exit eventually. If all FDs hang up (normal case when the
- * ltt-sessiond stops), we can exit cleanly, but if there is a problem and for
- * whatever reason some FDs remain open, the consumer should still exit
+ * lttng-sessiond stops), we can exit cleanly, but if there is a problem and
+ * for whatever reason some FDs remain open, the consumer should still exit
* eventually.
*
* If the timeout is reached, it means that during this period no events
enum lttng_consumer_type {
LTTNG_CONSUMER_UNKNOWN = 0,
LTTNG_CONSUMER_KERNEL,
- LTTNG_CONSUMER_UST,
+ LTTNG_CONSUMER64_UST,
+ LTTNG_CONSUMER32_UST,
};
struct lttng_consumer_channel {
int wait_fd;
void *mmap_base;
size_t mmap_len;
- struct shm_handle *handle;
+ 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. */
-struct lib_ring_buffer;
+struct lttng_ust_lib_ring_buffer;
/*
* Internal representation of the streams, sessiond_key is used to identify
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 lib_ring_buffer *buf;
+ struct lttng_ust_lib_ring_buffer *buf;
int cpu;
+ int hangup_flush_done;
};
/*
*/
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
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));
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 */