Fix: protocol mismatch between UST and tools

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/src/bin/lttng-sessiond/lttng-ust-ctl.h b/src/bin/lttng-sessiond/lttng-ust-ctl.h
index 8ee80bac4ec8d50b845182da4848db3ab12f9242..dccb089e1e2fbc8f6aea2f7305bb88e084f710e6 100644 (file)
--- a/src/bin/lttng-sessiond/lttng-ust-ctl.h
+++ b/src/bin/lttng-sessiond/lttng-ust-ctl.h
@@ -293,14 +293,18 @@ struct ustctl_enum_value {
        char padding[USTCTL_UST_ENUM_VALUE_PADDING];
 } LTTNG_PACKED;
 
+enum ustctl_ust_enum_entry_options {
+       USTCTL_UST_ENUM_ENTRY_OPTION_IS_AUTO = 1U << 0,
+};
+
 #define USTCTL_UST_ENUM_ENTRY_PADDING  32
 struct ustctl_enum_entry {
        struct ustctl_enum_value start, end; /* start and end are inclusive */
        char string[LTTNG_UST_SYM_NAME_LEN];
        union {
                struct {
-                       uint8_t is_auto;
-               } LTTNG_PACKED options;
+                       uint32_t options;
+               } LTTNG_PACKED extra;
                char padding[USTCTL_UST_ENUM_ENTRY_PADDING];
        } u;
 } LTTNG_PACKED;

diff --git a/src/bin/lttng-sessiond/ust-metadata.c b/src/bin/lttng-sessiond/ust-metadata.c
index 328d6ea4c414d15699c6c3aa84fdc70eede3b8e4..d24df194342f144ebd2bbee832c6b7b5de69595b 100644 (file)
--- a/src/bin/lttng-sessiond/ust-metadata.c
+++ b/src/bin/lttng-sessiond/ust-metadata.c
@@ -305,7 +305,8 @@ int ust_metadata_enum_statedump(struct ust_registry_session *session,
                        goto end;
                }
 
-               if (entry->u.options.is_auto) {
+               if (entry->u.extra.options &
+                               USTCTL_UST_ENUM_ENTRY_OPTION_IS_AUTO) {
                        ret = lttng_metadata_printf(session, ",\n");
                        if (ret) {
                                goto end;