Fix --disable-lttng-ust build after UST API update

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/lttng-sessiond/lttng-ust-abi.h b/lttng-sessiond/lttng-ust-abi.h
index 90a0822f661bb187d96f3400b44bf1f6ab3d762f..7cdae82483f0bc4b2e720adc60ea2e7155a69cdb 100644 (file)
--- a/lttng-sessiond/lttng-ust-abi.h
+++ b/lttng-sessiond/lttng-ust-abi.h
@@ -19,9 +19,10 @@
 #define LTTNG_UST_COMM_VERSION_MINOR           1
 
 enum lttng_ust_instrumentation {
-       LTTNG_UST_TRACEPOINT    = 0,
-       LTTNG_UST_PROBE         = 1,
-       LTTNG_UST_FUNCTION      = 2,
+       LTTNG_UST_TRACEPOINT            = 0,
+       LTTNG_UST_PROBE                 = 1,
+       LTTNG_UST_FUNCTION              = 2,
+       LTTNG_UST_TRACEPOINT_LOGLEVEL   = 3,
 };
 
 enum lttng_ust_output {
@@ -90,6 +91,12 @@ struct lttng_ust_channel_attr {
        enum lttng_ust_output output;           /* splice, mmap */
 };
 
+struct lttng_ust_tracepoint_iter {
+       char name[LTTNG_UST_SYM_NAME_LEN];      /* provider:name */
+       char loglevel[LTTNG_UST_SYM_NAME_LEN];  /* loglevel */
+       int64_t loglevel_value;
+};
+
 struct lttng_ust_object_data {
        int handle;
        int shm_fd;

diff --git a/lttng-sessiond/lttng-ust-ctl.h b/lttng-sessiond/lttng-ust-ctl.h
index 114cc73c56f1e7c46bdb4f0b9fcdf78df4fd4e2e..687379448d11511d6c86af243b1f88d8202d129c 100644 (file)
--- a/lttng-sessiond/lttng-ust-ctl.h
+++ b/lttng-sessiond/lttng-ust-ctl.h
@@ -54,7 +54,7 @@ int ustctl_tracepoint_list(int sock);
  * handle. End is iteration is reached when -ENOENT is returned.
  */
 int ustctl_tracepoint_list_get(int sock, int tp_list_handle,
-               char iter[LTTNG_UST_SYM_NAME_LEN]);
+               struct lttng_ust_tracepoint_iter *iter);
 
 int ustctl_tracer_version(int sock, struct lttng_ust_tracer_version *v);
 int ustctl_wait_quiescent(int sock);
@@ -130,6 +130,6 @@ void ustctl_flush_buffer(struct lttng_ust_shm_handle *handle,
                int producer_active);
 
 /* Release object created by members of this API */
-void ustctl_release_object(int sock, struct lttng_ust_object_data *data);
+int ustctl_release_object(int sock, struct lttng_ust_object_data *data);
 
 #endif /* _LTTNG_UST_CTL_H */