X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.h;h=e6590c33c047028f079bb905febdaf9779ef6472;hb=4878de5c7deb512bbdac4fdfc498907efa06fb7c;hp=ac29857b35cf7c681dbb10a22a6facd9ff7cc76f;hpb=6d574024f868e661ae688ecbc47a110a1311c57e;p=lttng-tools.git

diff --git a/src/common/ust-consumer/ust-consumer.h b/src/common/ust-consumer/ust-consumer.h
index ac29857b3..e6590c33c 100644
--- a/src/common/ust-consumer/ust-consumer.h
+++ b/src/common/ust-consumer/ust-consumer.h
@@ -1,32 +1,23 @@
 /*
- * Copyright (C) 2011 - Julien Desfossez <julien.desfossez@polymtl.ca>
- * Copyright (C) 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2011 EfficiOS Inc.
+ * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef _LTTNG_USTCONSUMER_H
 #define _LTTNG_USTCONSUMER_H
 
-#include <config.h>
-#include <errno.h>
-
-#include <common/consumer.h>
+#include <common/compat/errno.h>
+#include <common/consumer/consumer.h>
+#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_get_produced_snapshot(
 		struct lttng_consumer_stream *stream, unsigned long *pos);
@@ -38,6 +29,7 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 
 extern int lttng_ustconsumer_allocate_channel(struct lttng_consumer_channel *chan);
 extern void lttng_ustconsumer_del_channel(struct lttng_consumer_channel *chan);
+extern void lttng_ustconsumer_free_channel(struct lttng_consumer_channel *chan);
 extern int lttng_ustconsumer_add_stream(struct lttng_consumer_stream *stream);
 extern void lttng_ustconsumer_del_stream(struct lttng_consumer_stream *stream);
 
@@ -47,163 +39,250 @@ int lttng_ustconsumer_on_recv_stream(struct lttng_consumer_stream *stream);
 
 void lttng_ustconsumer_on_stream_hangup(struct lttng_consumer_stream *stream);
 
-int lttng_ustctl_get_mmap_read_offset(struct lttng_consumer_stream *stream,
-		unsigned long *off);
-void *lttng_ustctl_get_mmap_base(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_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, struct lttng_consumer_channel *channel,
-		int timer, int wait);
+		uint64_t len, uint64_t version,
+		struct lttng_consumer_channel *channel, int timer, int wait);
 int lttng_ustconsumer_request_metadata(struct lttng_consumer_local_data *ctx,
 		struct lttng_consumer_channel *channel, int timer, int wait);
-int lttng_ustconsumer_sync_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);
+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 */
 
 static inline
 ssize_t lttng_ustconsumer_on_read_subbuffer_mmap(
-		struct lttng_consumer_local_data *ctx,
-		struct lttng_consumer_stream *stream, unsigned long len,
-		unsigned long padding)
+		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,
-		struct lttng_consumer_stream *uststream, unsigned long len,
-		unsigned long padding)
+		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)
+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)))
 {
 	return -ENOSYS;
 }
 
 static inline
 int lttng_ustconsumer_get_produced_snapshot(
-		struct lttng_consumer_stream *stream, unsigned long *pos)
+		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,
-		int sock, struct pollfd *consumer_sockpoll)
+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_allocate_channel(struct lttng_consumer_channel *chan)
+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)
+int lttng_ustconsumer_allocate_channel(
+		struct lttng_consumer_channel *chan __attribute__((unused)))
 {
+	return -ENOSYS;
 }
 
 static inline
-int lttng_ustconsumer_add_stream(struct lttng_consumer_stream *stream)
+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
+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)
+void lttng_ustconsumer_del_stream(
+		struct lttng_consumer_stream *stream __attribute__((unused)))
 {
 }
 
 static inline
-int lttng_ustconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
-		struct lttng_consumer_local_data *ctx)
+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)
+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)
+void lttng_ustconsumer_on_stream_hangup(
+		struct lttng_consumer_stream *stream __attribute__((unused)))
 {
 }
 
 static inline
-int lttng_ustctl_get_mmap_read_offset(struct lttng_consumer_stream *stream,
-		unsigned long *off)
+int lttng_ustconsumer_data_pending(
+		struct lttng_consumer_stream *stream __attribute__((unused)))
 {
 	return -ENOSYS;
 }
+
 static inline
-int lttng_ustconsumer_data_pending(struct lttng_consumer_stream *stream)
+int lttng_ust_flush_buffer(struct lttng_consumer_stream *stream __attribute__((unused)),
+		int producer_active __attribute__((unused)))
 {
 	return -ENOSYS;
 }
+
 static inline
-void *lttng_ustctl_get_mmap_base(struct lttng_consumer_stream *stream)
+void lttng_ustconsumer_close_all_metadata(
+		struct lttng_ht *ht __attribute__((unused)))
 {
-	return NULL;
 }
+
 static inline
-void lttng_ustconsumer_close_all_metadata(struct lttng_ht *ht)
+void lttng_ustconsumer_close_metadata(
+		struct lttng_consumer_channel *metadata __attribute__((unused)))
 {
 }
 static inline
-void lttng_ustconsumer_close_metadata(struct lttng_consumer_channel *metadata)
+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)
+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)))
 {
+	return -ENOSYS;
 }
+
 static inline
-int lttng_ustconsumer_recv_metadata(int sock, uint64_t key, uint64_t offset,
-		uint64_t len, struct lttng_consumer_channel *channel,
-		int timer)
+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)))
 {
 	return -ENOSYS;
 }
+
 static inline
-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 __attribute__((unused)),
+		struct lttng_consumer_stream *metadata __attribute__((unused)))
 {
-	return -ENOSYS;
+	return SYNC_METADATA_STATUS_ERROR;
 }
+
 static inline
-int 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 __attribute__((unused)),
+		int producer __attribute__((unused)))
 {
 	return -ENOSYS;
 }
+
 static inline
-void lttng_ustconsumer_flush_buffer(struct lttng_consumer_stream *stream,
-		int producer)
+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, uint64_t *ts)
+		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)))
+{
+	return -ENOSYS;
+}
+
+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)))
+{
+}
 #endif /* HAVE_LIBLTTNG_UST_CTL */
 
 #endif /* _LTTNG_USTCONSUMER_H */