X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-metadata.c;h=49edb1711254bf9475ddc74f9432aec0e0a38312;hp=851fb99f4fed9679a7c609066c119a8bbb70991b;hb=389fbf04b41e2002be44a1e3392bfade2f1deeef;hpb=3b016e589cc2229f0d3be8e6e61e8eeed8b7e9e6

diff --git a/src/bin/lttng-sessiond/ust-metadata.c b/src/bin/lttng-sessiond/ust-metadata.c
index 851fb99f4..49edb1711 100644
--- 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];
@@ -299,40 +300,56 @@ int ust_metadata_enum_statedump(struct ust_registry_session *session,
 				goto end;
 			}
 		}
-		ret = lttng_metadata_printf(session,
-				"\" = ");
+		ret = lttng_metadata_printf(session, "\"");
 		if (ret) {
 			goto end;
 		}
 
-		if (entry->start.signedness) {
-			ret = lttng_metadata_printf(session,
-				"%lld", (long long) entry->start.value);
+		if (entry->u.extra.options &
+				USTCTL_UST_ENUM_ENTRY_OPTION_IS_AUTO) {
+			ret = lttng_metadata_printf(session, ",\n");
+			if (ret) {
+				goto end;
+			}
 		} else {
 			ret = lttng_metadata_printf(session,
-				"%llu", entry->start.value);
-		}
-		if (ret) {
-			goto end;
-		}
+					" = ");
+			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) {
+			if (entry->start.signedness) {
 				ret = lttng_metadata_printf(session,
-					" ... %lld,\n", (long long) entry->end.value);
+					"%lld", (long long) entry->start.value);
 			} else {
 				ret = lttng_metadata_printf(session,
-					" ... %llu,\n", entry->end.value);
+					"%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;
 			}
-		}
-		if (ret) {
-			goto end;
 		}
 	}
+	nesting--;
 	sanitize_ctf_identifier(identifier, field_name);
 	ret = print_tabs(session, nesting);
 	if (ret) {
@@ -802,7 +819,7 @@ int measure_single_clock_offset(struct offset_sample *sample)
 	int ret;
 
 	monotonic[0] = trace_clock_read64();
-	ret = clock_gettime(CLOCK_REALTIME, &rts);
+	ret = lttng_clock_gettime(CLOCK_REALTIME, &rts);
 	if (ret < 0) {
 		return ret;
 	}