X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-ctl.h;h=25e588b39a32f409da0f83de037b2205e2350624;hb=0997899b47dda080f4f9346b5d4f66ad60bee700;hp=ed944e97b0a872b657ad8ec1045c6b5c912271db;hpb=249cffb5cdf9cff45298a44580b24d4dd9d63ba0;p=lttng-ust.git

diff --git a/include/lttng/ust-ctl.h b/include/lttng/ust-ctl.h
index ed944e97..25e588b3 100644
--- a/include/lttng/ust-ctl.h
+++ b/include/lttng/ust-ctl.h
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: GPL-2.0-only
  *
- * Copyright (C) 2011 Julien Desfossez <julien.desfossez@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
  * Copyright (C) 2011-2013 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
@@ -16,6 +16,11 @@
 
 #include <lttng/ust-abi.h>
 #include <lttng/ust-utils.h>
+#include <lttng/ust-sigbus.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #ifndef LTTNG_UST_UUID_LEN
 #define LTTNG_UST_UUID_LEN	16
@@ -24,7 +29,7 @@
 /* Default unix socket path */
 #define LTTNG_UST_SOCK_FILENAME					\
 	"lttng-ust-sock-"					\
-	lttng_ust_stringify(LTTNG_UST_ABI_MAJOR_VERSION)
+	lttng_ust_stringify(LTTNG_UST_ABI_MAJOR_VERSION_OLDEST_COMPATIBLE)
 
 /*
  * Shared memory files path are automatically related to shm root, e.g.
@@ -32,7 +37,7 @@
  */
 #define LTTNG_UST_WAIT_FILENAME					\
 	"lttng-ust-wait-"					\
-	lttng_ust_stringify(LTTNG_UST_ABI_MAJOR_VERSION)
+	lttng_ust_stringify(LTTNG_UST_ABI_MAJOR_VERSION_OLDEST_COMPATIBLE)
 
 struct lttng_ust_ctl_consumer_channel_attr {
 	enum lttng_ust_abi_chan_type type;
@@ -251,9 +256,9 @@ int lttng_ust_ctl_get_subbuf(struct lttng_ust_ctl_consumer_stream *stream,
 		unsigned long *pos);
 int lttng_ust_ctl_put_subbuf(struct lttng_ust_ctl_consumer_stream *stream);
 
-void lttng_ust_ctl_flush_buffer(struct lttng_ust_ctl_consumer_stream *stream,
+int lttng_ust_ctl_flush_buffer(struct lttng_ust_ctl_consumer_stream *stream,
 		int producer_active);
-void lttng_ust_ctl_clear_buffer(struct lttng_ust_ctl_consumer_stream *stream);
+int lttng_ust_ctl_clear_buffer(struct lttng_ust_ctl_consumer_stream *stream);
 
 /* index */
 
@@ -653,4 +658,10 @@ int lttng_ust_ctl_counter_aggregate(struct lttng_ust_ctl_daemon_counter *counter
 int lttng_ust_ctl_counter_clear(struct lttng_ust_ctl_daemon_counter *counter,
 		const size_t *dimension_indexes);
 
+void lttng_ust_ctl_sigbus_handle(void *addr);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _LTTNG_UST_CTL_H */