X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.h;h=e481f0850114a68165bc1baff41559ef09bbd93b;hb=21cf9b6b1843774306a76f4dccddddd706b64f79;hp=31a734c777931eb2ed92f9a55439da1cfbabf122;hpb=b623cb6a788d9e666d9a93658ab04b06458863ef;p=lttng-tools.git

diff --git a/src/common/ust-consumer/ust-consumer.h b/src/common/ust-consumer/ust-consumer.h
index 31a734c77..e481f0850 100644
--- a/src/common/ust-consumer/ust-consumer.h
+++ b/src/common/ust-consumer/ust-consumer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Julien Desfossez <julien.desfossez@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
  * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * SPDX-License-Identifier: GPL-2.0-only
@@ -39,7 +39,7 @@ int lttng_ustconsumer_on_recv_stream(struct lttng_consumer_stream *stream);
 
 void lttng_ustconsumer_on_stream_hangup(struct lttng_consumer_stream *stream);
 
-void lttng_lttng_ust_ctl_flush_buffer(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);
@@ -55,13 +55,14 @@ int lttng_ustconsumer_request_metadata(struct lttng_consumer_local_data *ctx,
 enum sync_metadata_status lttng_ustconsumer_sync_metadata(
 		struct lttng_consumer_local_data *ctx,
 		struct lttng_consumer_stream *metadata);
-void lttng_ustconsumer_flush_buffer(struct lttng_consumer_stream *stream,
+int lttng_ustconsumer_flush_buffer(struct lttng_consumer_stream *stream,
 		int producer);
-void lttng_ustconsumer_clear_buffer(struct lttng_consumer_stream *stream);
+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);
+void lttng_ustconsumer_sigbus_handle(void *addr);
 
 #else /* HAVE_LIBLTTNG_UST_CTL */
 
@@ -162,26 +163,16 @@ void lttng_ustconsumer_on_stream_hangup(struct lttng_consumer_stream *stream)
 {
 }
 
-static inline
-int lttng_lttng_ust_ctl_get_mmap_read_offset(struct lttng_consumer_stream *stream,
-		unsigned long *off)
-{
-	return -ENOSYS;
-}
 static inline
 int lttng_ustconsumer_data_pending(struct lttng_consumer_stream *stream)
 {
 	return -ENOSYS;
 }
 static inline
-void *lttng_lttng_ust_ctl_get_mmap_base(struct lttng_consumer_stream *stream)
-{
-	return NULL;
-}
-static inline
-void lttng_lttng_ust_ctl_flush_buffer(struct lttng_consumer_stream *stream,
+int lttng_ust_flush_buffer(struct lttng_consumer_stream *stream,
 		int producer_active)
 {
+	return -ENOSYS;
 }
 static inline
 void lttng_ustconsumer_close_all_metadata(struct lttng_ht *ht)
@@ -215,13 +206,15 @@ enum sync_metadata_status lttng_ustconsumer_sync_metadata(struct lttng_consumer_
 	return SYNC_METADATA_STATUS_ERROR;
 }
 static inline
-void lttng_ustconsumer_flush_buffer(struct lttng_consumer_stream *stream,
+int lttng_ustconsumer_flush_buffer(struct lttng_consumer_stream *stream,
 		int producer)
 {
+	return -ENOSYS;
 }
 static inline
-void lttng_ustconsumer_clear_buffer(struct lttng_consumer_stream *stream)
+int lttng_ustconsumer_clear_buffer(struct lttng_consumer_stream *stream)
 {
+	return -ENOSYS;
 }
 static inline
 int lttng_ustconsumer_get_current_timestamp(
@@ -241,6 +234,10 @@ int lttng_ustconsumer_get_stream_id(struct lttng_consumer_stream *stream,
 {
 	return -ENOSYS;
 }
+static inline
+void lttng_ustconsumer_sigbus_handle(void *addr)
+{
+}
 #endif /* HAVE_LIBLTTNG_UST_CTL */
 
 #endif /* _LTTNG_USTCONSUMER_H */