bin: compile lttng-sessiond as C++

[lttng-tools.git] / src / bin / lttng-sessiond / ust-ctl-internal.h

diff --git a/src/bin/lttng-sessiond/ust-ctl-internal.h b/src/bin/lttng-sessiond/ust-ctl-internal.h
index 96cbf79bc88efb85fadca521717cc326af44ad2a..d85af28684d6dc034cc93d11cf362a0a0aa9cbcc 100644 (file)
--- a/src/bin/lttng-sessiond/ust-ctl-internal.h
+++ b/src/bin/lttng-sessiond/ust-ctl-internal.h
@@ -14,6 +14,10 @@
 
 #include "lttng-ust-abi.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef LTTNG_UST_UUID_LEN
 #define LTTNG_UST_UUID_LEN     16
 #endif
@@ -21,7 +25,7 @@
 /* Default unix socket path */
 #define LTTNG_UST_SOCK_FILENAME                                        \
        "lttng-ust-sock-"                                       \
-       __ust_stringify(LTTNG_UST_ABI_MAJOR_VERSION)
+       __ust_stringify(LTTNG_UST_ABI_MAJOR_VERSION_OLDEST_COMPATIBLE)
 
 /*
  * Shared memory files path are automatically related to shm root, e.g.
@@ -29,7 +33,7 @@
  */
 #define LTTNG_UST_WAIT_FILENAME                                        \
        "lttng-ust-wait-"                                       \
-       __ust_stringify(LTTNG_UST_ABI_MAJOR_VERSION)
+       __ust_stringify(LTTNG_UST_ABI_MAJOR_VERSION_OLDEST_COMPATIBLE)
 
 struct lttng_ust_shm_handle;
 struct lttng_ust_lib_ring_buffer;
@@ -251,9 +255,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 +657,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_INTERNAL_H */