Prefix lttng_enum_desc with lttng_kernel_

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

diff --git a/include/instrumentation/events/net.h b/include/instrumentation/events/net.h
index ee171dadd5dea09aec0e43da88793d2c07c9c60d..fac99b56fffbbe86a664be9d612fda07756019bf 100644 (file)
--- a/include/instrumentation/events/net.h
+++ b/include/instrumentation/events/net.h
@@ -273,7 +273,7 @@ static struct lttng_kernel_enum_entry proto_transport_enum_entries[] = {
        },
 };
 
-static const struct lttng_enum_desc proto_transport_header_type = {
+static const struct lttng_kernel_enum_desc proto_transport_header_type = {
        .name = "proto_transport_header_type",
        .entries = proto_transport_enum_entries,
        .nr_entries = ARRAY_SIZE(proto_transport_enum_entries),
@@ -302,7 +302,7 @@ static struct lttng_kernel_enum_entry transport_enum_entries[] = {
        },
 };
 
-static const struct lttng_enum_desc transport_header_type = {
+static const struct lttng_kernel_enum_desc transport_header_type = {
        .name = "transport_header_type",
        .entries = transport_enum_entries,
        .nr_entries = ARRAY_SIZE(transport_enum_entries),

diff --git a/include/lttng/events.h b/include/lttng/events.h
index 5e3800665ff6ab86e8ae0dd2e066de4d97ecb277..05e8618438f8e1c9d4c63e562d7c65a626655da0 100644 (file)
--- a/include/lttng/events.h
+++ b/include/lttng/events.h
@@ -103,7 +103,7 @@ struct lttng_type {
                        enum lttng_kernel_string_encoding encoding;
                } string;
                struct {
-                       const struct lttng_enum_desc *desc;     /* Enumeration mapping */
+                       const struct lttng_kernel_enum_desc *desc;      /* Enumeration mapping */
                        const struct lttng_type *container_type;
                } enum_nestable;
                struct {
@@ -130,7 +130,7 @@ struct lttng_type {
        } u;
 };
 
-struct lttng_enum_desc {
+struct lttng_kernel_enum_desc {
        const char *name;
        const struct lttng_kernel_enum_entry *entries;
        unsigned int nr_entries;

diff --git a/include/lttng/tracepoint-event-impl.h b/include/lttng/tracepoint-event-impl.h
index bc13e56dc77087164b86b0d2d74805c97c7a2019..f488586a3a851791e6f2a64d6380a54d91047d37 100644 (file)
--- a/include/lttng/tracepoint-event-impl.h
+++ b/include/lttng/tracepoint-event-impl.h
@@ -474,7 +474,7 @@ void __event_notifier_template_proto___##_name(void);
 
 #undef LTTNG_TRACEPOINT_ENUM
 #define LTTNG_TRACEPOINT_ENUM(_name, _values)                                          \
-       static const struct lttng_enum_desc __enum_##_name = {                          \
+       static const struct lttng_kernel_enum_desc __enum_##_name = {                   \
                .name = #_name,                                                         \
                .entries = __enum_values__##_name,                                      \
                .nr_entries = ARRAY_SIZE(__enum_values__##_name),                       \

diff --git a/src/lttng-events.c b/src/lttng-events.c
index d64440d3fcc30a3b6652ffcbdf29831b0bd0ab53..57ff55b71e45e80c32b8c54547b584a8d47a4899 100644 (file)
--- a/src/lttng-events.c
+++ b/src/lttng-events.c
@@ -3267,7 +3267,7 @@ int _lttng_enum_type_statedump(struct lttng_session *session,
                const struct lttng_type *type,
                size_t nesting)
 {
-       const struct lttng_enum_desc *enum_desc;
+       const struct lttng_kernel_enum_desc *enum_desc;
        const struct lttng_type *container_type;
        int ret;
        unsigned int i, nr_entries;