X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.h;h=0c83baa8cec451fce5671c1bc51e0c2cd3970e5e;hb=bf8ac2eaec39ba99aaac4de946bbaf3dca4f5539;hp=7b381b2c75db6c7300cc6581206e0e12b1f5c0fa;hpb=b1316da1ffbd276fc8271e7a9438e683ad352781;p=lttng-tools.git

diff --git a/src/common/consumer/consumer.h b/src/common/consumer/consumer.h
index 7b381b2c7..0c83baa8c 100644
--- a/src/common/consumer/consumer.h
+++ b/src/common/consumer/consumer.h
@@ -96,7 +96,7 @@ enum sync_metadata_status {
 	SYNC_METADATA_STATUS_ERROR,
 };
 
-extern struct lttng_consumer_global_data consumer_data;
+extern struct lttng_consumer_global_data the_consumer_data;
 
 struct stream_list {
 	struct cds_list_head head;
@@ -160,7 +160,7 @@ struct lttng_consumer_channel {
 
 	/* For UST */
 	uid_t ust_app_uid;	/* Application UID. */
-	struct ustctl_consumer_channel *uchan;
+	struct lttng_ust_ctl_consumer_channel *uchan;
 	unsigned char uuid[LTTNG_UUID_STR_LEN];
 	/*
 	 * Temporary stream list used to store the streams once created and waiting
@@ -299,6 +299,12 @@ struct stream_subbuffer {
 	} info;
 };
 
+enum get_next_subbuffer_status {
+	GET_NEXT_SUBBUFFER_STATUS_OK,
+	GET_NEXT_SUBBUFFER_STATUS_NO_DATA,
+	GET_NEXT_SUBBUFFER_STATUS_ERROR,
+};
+
 /*
  * Perform any operation required to acknowledge
  * the wake-up of a consumer stream (e.g. consume a byte on a wake-up pipe).
@@ -321,8 +327,8 @@ typedef int (*on_sleep_cb)(struct lttng_consumer_stream *,
  *
  * Stream and channel locks are acquired during this call.
  */
-typedef int (*get_next_subbuffer_cb)(struct lttng_consumer_stream *,
-		struct stream_subbuffer *);
+typedef enum get_next_subbuffer_status (*get_next_subbuffer_cb)(
+		struct lttng_consumer_stream *, struct stream_subbuffer *);
 
 /*
  * Populate the stream_subbuffer's info member. The info to populate
@@ -540,7 +546,7 @@ struct lttng_consumer_stream {
 	/* Stream name. Format is: <channel_name>_<cpu_number> */
 	char name[LTTNG_SYMBOL_NAME_LEN];
 	/* Internal state of libustctl. */
-	struct ustctl_consumer_stream *ustream;
+	struct lttng_ust_ctl_consumer_stream *ustream;
 	struct cds_list_head send_node;
 	/* On-disk circular buffer */
 	uint64_t tracefile_size_current;
@@ -1053,5 +1059,6 @@ int lttng_consumer_clear_channel(struct lttng_consumer_channel *channel);
 enum lttcomm_return_code lttng_consumer_open_channel_packets(
 		struct lttng_consumer_channel *channel);
 int consumer_metadata_wakeup_pipe(const struct lttng_consumer_channel *channel);
+void lttng_consumer_sigbus_handle(void *addr);
 
 #endif /* LIB_CONSUMER_H */