X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.hpp;h=13de36f1ff5340c31d416c5f7ab735662e20c042;hb=HEAD;hp=1996a5b51572a137f13c8806db9ead70f949a4cb;hpb=2397268a583deb18a90ed2f76a95c6c6d46174f9;p=lttng-tools.git

diff --git a/src/common/ust-consumer/ust-consumer.hpp b/src/common/ust-consumer/ust-consumer.hpp
index 1996a5b51..13de36f1f 100644
--- a/src/common/ust-consumer/ust-consumer.hpp
+++ b/src/common/ust-consumer/ust-consumer.hpp
@@ -11,21 +11,22 @@
 
 #include <common/compat/errno.hpp>
 #include <common/consumer/consumer.hpp>
+
 #include <stdbool.h>
 
 #ifdef HAVE_LIBLTTNG_UST_CTL
 
 int lttng_ustconsumer_take_snapshot(struct lttng_consumer_stream *stream);
-int lttng_ustconsumer_sample_snapshot_positions(
-		struct lttng_consumer_stream *stream);
+int lttng_ustconsumer_sample_snapshot_positions(struct lttng_consumer_stream *stream);
 
-int lttng_ustconsumer_get_produced_snapshot(
-		struct lttng_consumer_stream *stream, unsigned long *pos);
-int lttng_ustconsumer_get_consumed_snapshot(
-		struct lttng_consumer_stream *stream, unsigned long *pos);
+int lttng_ustconsumer_get_produced_snapshot(struct lttng_consumer_stream *stream,
+					    unsigned long *pos);
+int lttng_ustconsumer_get_consumed_snapshot(struct lttng_consumer_stream *stream,
+					    unsigned long *pos);
 
 int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
-		int sock, struct pollfd *consumer_sockpoll);
+			       int sock,
+			       struct pollfd *consumer_sockpoll);
 
 extern void lttng_ustconsumer_del_channel(struct lttng_consumer_channel *chan);
 extern void lttng_ustconsumer_free_channel(struct lttng_consumer_channel *chan);
@@ -33,246 +34,224 @@ extern int lttng_ustconsumer_add_stream(struct lttng_consumer_stream *stream);
 extern void lttng_ustconsumer_del_stream(struct lttng_consumer_stream *stream);
 
 int lttng_ustconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
-		struct lttng_consumer_local_data *ctx);
+				     struct lttng_consumer_local_data *ctx);
 int lttng_ustconsumer_on_recv_stream(struct lttng_consumer_stream *stream);
 
 void lttng_ustconsumer_on_stream_hangup(struct lttng_consumer_stream *stream);
 
-int lttng_ust_flush_buffer(struct lttng_consumer_stream *stream,
-		int producer_active);
-int lttng_ustconsumer_get_stream_id(struct lttng_consumer_stream *stream,
-		uint64_t *stream_id);
+int lttng_ust_flush_buffer(struct lttng_consumer_stream *stream, int producer_active);
+int lttng_ustconsumer_get_stream_id(struct lttng_consumer_stream *stream, uint64_t *stream_id);
 int lttng_ustconsumer_data_pending(struct lttng_consumer_stream *stream);
 void lttng_ustconsumer_close_all_metadata(struct lttng_ht *ht);
 void lttng_ustconsumer_close_metadata(struct lttng_consumer_channel *metadata);
 void lttng_ustconsumer_close_stream_wakeup(struct lttng_consumer_stream *stream);
-int lttng_ustconsumer_recv_metadata(int sock, uint64_t key, uint64_t offset,
-		uint64_t len, uint64_t version,
-		struct lttng_consumer_channel *channel, int timer, int wait);
+int lttng_ustconsumer_recv_metadata(int sock,
+				    uint64_t key,
+				    uint64_t offset,
+				    uint64_t len,
+				    uint64_t version,
+				    struct lttng_consumer_channel *channel,
+				    bool invoked_by_timer,
+				    int wait);
 int lttng_ustconsumer_request_metadata(struct lttng_consumer_local_data *ctx,
-		struct lttng_consumer_channel *channel, int timer, int wait);
-enum sync_metadata_status lttng_ustconsumer_sync_metadata(
-		struct lttng_consumer_local_data *ctx,
-		struct lttng_consumer_stream *metadata);
-int lttng_ustconsumer_flush_buffer(struct lttng_consumer_stream *stream,
-		int producer);
+				       struct lttng_consumer_channel *channel,
+				       bool invoked_by_timer,
+				       int wait);
+enum sync_metadata_status lttng_ustconsumer_sync_metadata(struct lttng_consumer_local_data *ctx,
+							  struct lttng_consumer_stream *metadata);
+int lttng_ustconsumer_flush_buffer(struct lttng_consumer_stream *stream, int producer);
 int lttng_ustconsumer_clear_buffer(struct lttng_consumer_stream *stream);
-int lttng_ustconsumer_get_current_timestamp(
-		struct lttng_consumer_stream *stream, uint64_t *ts);
-int lttng_ustconsumer_get_sequence_number(
-		struct lttng_consumer_stream *stream, uint64_t *seq);
+int lttng_ustconsumer_get_current_timestamp(struct lttng_consumer_stream *stream, uint64_t *ts);
+int lttng_ustconsumer_get_sequence_number(struct lttng_consumer_stream *stream, uint64_t *seq);
 void lttng_ustconsumer_sigbus_handle(void *addr);
 
 #else /* HAVE_LIBLTTNG_UST_CTL */
 
-static inline
-ssize_t lttng_ustconsumer_on_read_subbuffer_mmap(
-		struct lttng_consumer_local_data *ctx __attribute__((unused)),
-		struct lttng_consumer_stream *stream __attribute__((unused)),
-		unsigned long len __attribute__((unused)),
-		unsigned long padding __attribute__((unused)))
+static inline ssize_t lttng_ustconsumer_on_read_subbuffer_mmap(
+	struct lttng_consumer_local_data *ctx __attribute__((unused)),
+	struct lttng_consumer_stream *stream __attribute__((unused)),
+	unsigned long len __attribute__((unused)),
+	unsigned long padding __attribute__((unused)))
 {
 	return -ENOSYS;
 }
 
-static inline
-ssize_t lttng_ustconsumer_on_read_subbuffer_splice(
-		struct lttng_consumer_local_data *ctx __attribute__((unused)),
-		struct lttng_consumer_stream *uststream __attribute__((unused)),
-		unsigned long len __attribute__((unused)),
-		unsigned long padding __attribute__((unused)))
+static inline ssize_t lttng_ustconsumer_on_read_subbuffer_splice(
+	struct lttng_consumer_local_data *ctx __attribute__((unused)),
+	struct lttng_consumer_stream *uststream __attribute__((unused)),
+	unsigned long len __attribute__((unused)),
+	unsigned long padding __attribute__((unused)))
 {
 	return -ENOSYS;
 }
 
-static inline
-int lttng_ustconsumer_take_snapshot(
-		struct lttng_consumer_stream *stream __attribute__((unused)))
+static inline int lttng_ustconsumer_take_snapshot(struct lttng_consumer_stream *stream
+						  __attribute__((unused)))
 {
 	return -ENOSYS;
 }
 
-static inline
-int lttng_ustconsumer_sample_snapshot_positions(
-		struct lttng_consumer_stream *stream __attribute__((unused)))
+static inline int lttng_ustconsumer_sample_snapshot_positions(struct lttng_consumer_stream *stream
+							      __attribute__((unused)))
 {
 	return -ENOSYS;
 }
 
-static inline
-int lttng_ustconsumer_get_produced_snapshot(
-		struct lttng_consumer_stream *stream __attribute__((unused)),
-		unsigned long *pos __attribute__((unused)))
+static inline int lttng_ustconsumer_get_produced_snapshot(struct lttng_consumer_stream *stream
+							  __attribute__((unused)),
+							  unsigned long *pos
+							  __attribute__((unused)))
 {
 	return -ENOSYS;
 }
 
-static inline
-int lttng_ustconsumer_get_consumed_snapshot(
-		struct lttng_consumer_stream *stream __attribute__((unused)),
-		unsigned long *pos __attribute__((unused)))
+static inline int lttng_ustconsumer_get_consumed_snapshot(struct lttng_consumer_stream *stream
+							  __attribute__((unused)),
+							  unsigned long *pos
+							  __attribute__((unused)))
 {
 	return -ENOSYS;
 }
 
-static inline
-int lttng_ustconsumer_recv_cmd(
-		struct lttng_consumer_local_data *ctx __attribute__((unused)),
-		int sock __attribute__((unused)),
-		struct pollfd *consumer_sockpoll __attribute__((unused)))
+static inline int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx
+					     __attribute__((unused)),
+					     int sock __attribute__((unused)),
+					     struct pollfd *consumer_sockpoll
+					     __attribute__((unused)))
 {
 	return -ENOSYS;
 }
 
-static inline
-void lttng_ustconsumer_del_channel(
-		struct lttng_consumer_channel *chan __attribute__((unused)))
+static inline void lttng_ustconsumer_del_channel(struct lttng_consumer_channel *chan
+						 __attribute__((unused)))
 {
 }
 
-static inline
-void lttng_ustconsumer_free_channel(
-		struct lttng_consumer_channel *chan __attribute__((unused)))
+static inline void lttng_ustconsumer_free_channel(struct lttng_consumer_channel *chan
+						  __attribute__((unused)))
 {
 }
 
-static inline
-int lttng_ustconsumer_add_stream(
-		struct lttng_consumer_stream *stream __attribute__((unused)))
+static inline int lttng_ustconsumer_add_stream(struct lttng_consumer_stream *stream
+					       __attribute__((unused)))
 {
 	return -ENOSYS;
 }
 
-static inline
-void lttng_ustconsumer_del_stream(
-		struct lttng_consumer_stream *stream __attribute__((unused)))
+static inline void lttng_ustconsumer_del_stream(struct lttng_consumer_stream *stream
+						__attribute__((unused)))
 {
 }
 
-static inline
-int lttng_ustconsumer_read_subbuffer(
-		struct lttng_consumer_stream *stream __attribute__((unused)),
-		struct lttng_consumer_local_data *ctx __attribute__((unused)))
+static inline int lttng_ustconsumer_read_subbuffer(struct lttng_consumer_stream *stream
+						   __attribute__((unused)),
+						   struct lttng_consumer_local_data *ctx
+						   __attribute__((unused)))
 {
 	return -ENOSYS;
 }
 
-static inline
-int lttng_ustconsumer_on_recv_stream(
-		struct lttng_consumer_stream *stream __attribute__((unused)))
+static inline int lttng_ustconsumer_on_recv_stream(struct lttng_consumer_stream *stream
+						   __attribute__((unused)))
 {
 	return -ENOSYS;
 }
 
-static inline
-void lttng_ustconsumer_on_stream_hangup(
-		struct lttng_consumer_stream *stream __attribute__((unused)))
+static inline void lttng_ustconsumer_on_stream_hangup(struct lttng_consumer_stream *stream
+						      __attribute__((unused)))
 {
 }
 
-static inline
-int lttng_ustconsumer_data_pending(
-		struct lttng_consumer_stream *stream __attribute__((unused)))
+static inline int lttng_ustconsumer_data_pending(struct lttng_consumer_stream *stream
+						 __attribute__((unused)))
 {
 	return -ENOSYS;
 }
 
-static inline
-int lttng_ust_flush_buffer(struct lttng_consumer_stream *stream __attribute__((unused)),
-		int producer_active __attribute__((unused)))
+static inline int lttng_ust_flush_buffer(struct lttng_consumer_stream *stream
+					 __attribute__((unused)),
+					 int producer_active __attribute__((unused)))
 {
 	return -ENOSYS;
 }
 
-static inline
-void lttng_ustconsumer_close_all_metadata(
-		struct lttng_ht *ht __attribute__((unused)))
+static inline void lttng_ustconsumer_close_all_metadata(struct lttng_ht *ht __attribute__((unused)))
 {
 }
 
-static inline
-void lttng_ustconsumer_close_metadata(
-		struct lttng_consumer_channel *metadata __attribute__((unused)))
+static inline void lttng_ustconsumer_close_metadata(struct lttng_consumer_channel *metadata
+						    __attribute__((unused)))
 {
 }
-static inline
-void lttng_ustconsumer_close_stream_wakeup(
-		struct lttng_consumer_stream *stream __attribute__((unused)))
+static inline void lttng_ustconsumer_close_stream_wakeup(struct lttng_consumer_stream *stream
+							 __attribute__((unused)))
 {
 }
 
-static inline
-int lttng_ustconsumer_recv_metadata(int sock __attribute__((unused)),
-		uint64_t key __attribute__((unused)),
-		uint64_t offset __attribute__((unused)),
-		uint64_t len __attribute__((unused)),
-		uint64_t version __attribute__((unused)),
-		struct lttng_consumer_channel *channel __attribute__((unused)),
-		int timer __attribute__((unused)))
+static inline int lttng_ustconsumer_recv_metadata(int sock __attribute__((unused)),
+						  uint64_t key __attribute__((unused)),
+						  uint64_t offset __attribute__((unused)),
+						  uint64_t len __attribute__((unused)),
+						  uint64_t version __attribute__((unused)),
+						  struct lttng_consumer_channel *channel
+						  __attribute__((unused)),
+						  bool invoked_by_timer __attribute__((unused)))
 {
 	return -ENOSYS;
 }
 
-static inline
-int lttng_ustconsumer_request_metadata(
-		struct lttng_consumer_local_data *ctx __attribute__((unused)),
-		struct lttng_consumer_channel *channel __attribute__((unused)),
-		int timer __attribute__((unused)),
-		int wait __attribute__((unused)))
+static inline int lttng_ustconsumer_request_metadata(struct lttng_consumer_local_data *ctx
+						     __attribute__((unused)),
+						     struct lttng_consumer_channel *channel
+						     __attribute__((unused)),
+						     bool invoked_by_timer __attribute__((unused)),
+						     int wait __attribute__((unused)))
 {
 	return -ENOSYS;
 }
 
-static inline
-enum sync_metadata_status lttng_ustconsumer_sync_metadata(
-		struct lttng_consumer_local_data *ctx __attribute__((unused)),
-		struct lttng_consumer_stream *metadata __attribute__((unused)))
+static inline enum sync_metadata_status
+lttng_ustconsumer_sync_metadata(struct lttng_consumer_local_data *ctx __attribute__((unused)),
+				struct lttng_consumer_stream *metadata __attribute__((unused)))
 {
 	return SYNC_METADATA_STATUS_ERROR;
 }
 
-static inline
-int lttng_ustconsumer_flush_buffer(
-		struct lttng_consumer_stream *stream __attribute__((unused)),
-		int producer __attribute__((unused)))
+static inline int lttng_ustconsumer_flush_buffer(struct lttng_consumer_stream *stream
+						 __attribute__((unused)),
+						 int producer __attribute__((unused)))
 {
 	return -ENOSYS;
 }
 
-static inline
-int lttng_ustconsumer_clear_buffer(
-		struct lttng_consumer_stream *stream __attribute__((unused)))
+static inline int lttng_ustconsumer_clear_buffer(struct lttng_consumer_stream *stream
+						 __attribute__((unused)))
 {
 	return -ENOSYS;
 }
 
-static inline
-int lttng_ustconsumer_get_current_timestamp(
-		struct lttng_consumer_stream *stream __attribute__((unused)),
-		uint64_t *ts __attribute__((unused)))
+static inline int lttng_ustconsumer_get_current_timestamp(struct lttng_consumer_stream *stream
+							  __attribute__((unused)),
+							  uint64_t *ts __attribute__((unused)))
 {
 	return -ENOSYS;
 }
 
-static inline
-int lttng_ustconsumer_get_sequence_number(
-		struct lttng_consumer_stream *stream __attribute__((unused)),
-		uint64_t *seq __attribute__((unused)))
+static inline int lttng_ustconsumer_get_sequence_number(struct lttng_consumer_stream *stream
+							__attribute__((unused)),
+							uint64_t *seq __attribute__((unused)))
 {
 	return -ENOSYS;
 }
 
-static inline
-int lttng_ustconsumer_get_stream_id(
-		struct lttng_consumer_stream *stream __attribute__((unused)),
-		uint64_t *stream_id __attribute__((unused)))
+static inline int lttng_ustconsumer_get_stream_id(struct lttng_consumer_stream *stream
+						  __attribute__((unused)),
+						  uint64_t *stream_id __attribute__((unused)))
 {
 	return -ENOSYS;
 }
 
-static inline
-void lttng_ustconsumer_sigbus_handle(
-		void *addr __attribute__((unused)))
+static inline void lttng_ustconsumer_sigbus_handle(void *addr __attribute__((unused)))
 {
 }
 #endif /* HAVE_LIBLTTNG_UST_CTL */