From 177f8533cf66c388b1e957c9c1c18f6b4f8ed418 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Wed, 30 Nov 2011 18:58:45 -0500 Subject: [PATCH] Fix --disable-lttng-ust build after UST API update Signed-off-by: Mathieu Desnoyers --- lttng-sessiond/lttng-ust-abi.h | 13 ++++++++++--- lttng-sessiond/lttng-ust-ctl.h | 4 ++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/lttng-sessiond/lttng-ust-abi.h b/lttng-sessiond/lttng-ust-abi.h index 90a0822f6..7cdae8248 100644 --- 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 114cc73c5..687379448 100644 --- 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 */ -- 2.34.1