ust-metadata.c: nest/indent enumeration entries

[lttng-tools.git] / src / bin / lttng-sessiond / ust-metadata.c

diff --git a/src/bin/lttng-sessiond/ust-metadata.c b/src/bin/lttng-sessiond/ust-metadata.c
index 78ecb1dd36bd306c367a1035df838ff94ce6f961..c97013f438a88df9b9d7ccf1205761731261860b 100644 (file)
--- a/src/bin/lttng-sessiond/ust-metadata.c
+++ b/src/bin/lttng-sessiond/ust-metadata.c
@@ -262,6 +262,7 @@ int ust_metadata_enum_statedump(struct ust_registry_session *session,
        if (ret) {
                goto end;
        }
+       nesting++;
        /* Dump all entries */
        for (i = 0; i < nr_entries; i++) {
                const struct ustctl_enum_entry *entry = &entries[i];
@@ -304,19 +305,36 @@ int ust_metadata_enum_statedump(struct ust_registry_session *session,
                if (ret) {
                        goto end;
                }
-               if (entry->start == entry->end) {
+
+               if (entry->start.signedness) {
                        ret = lttng_metadata_printf(session,
-                                       "%d,\n",
-                                       entry->start);
+                               "%lld", (long long) entry->start.value);
                } else {
                        ret = lttng_metadata_printf(session,
-                                       "%d ... %d,\n",
-                                       entry->start, entry->end);
+                               "%llu", entry->start.value);
+               }
+               if (ret) {
+                       goto end;
+               }
+
+               if (entry->start.signedness == entry->end.signedness &&
+                               entry->start.value == entry->end.value) {
+                       ret = lttng_metadata_printf(session,
+                               ",\n");
+               } else {
+                       if (entry->end.signedness) {
+                               ret = lttng_metadata_printf(session,
+                                       " ... %lld,\n", (long long) entry->end.value);
+                       } else {
+                               ret = lttng_metadata_printf(session,
+                                       " ... %llu,\n", entry->end.value);
+                       }
                }
                if (ret) {
                        goto end;
                }
        }
+       nesting--;
        sanitize_ctf_identifier(identifier, field_name);
        ret = print_tabs(session, nesting);
        if (ret) {
@@ -723,6 +741,7 @@ int _lttng_stream_packet_context_declare(struct ust_registry_session *session)
                "       uint64_clock_monotonic_t timestamp_end;\n"
                "       uint64_t content_size;\n"
                "       uint64_t packet_size;\n"
+               "       uint64_t packet_seq_num;\n"
                "       unsigned long events_discarded;\n"
                "       uint32_t cpu_id;\n"
                "};\n\n"
@@ -885,6 +904,7 @@ int ust_metadata_session_statedump(struct ust_registry_session *session,
                "               uint32_t magic;\n"
                "               uint8_t  uuid[16];\n"
                "               uint32_t stream_id;\n"
+               "               uint64_t stream_instance_id;\n"
                "       };\n"
                "};\n\n",
                session->uint8_t_alignment,