X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-metadata.c;h=3256c2cb74a26569dada62cdd6fc2d705f2e5766;hp=328d6ea4c414d15699c6c3aa84fdc70eede3b8e4;hb=c8a9de5a85fb150d3ceaa5ca1a8b1b2b91d050d5;hpb=e85e37239d682b8127005c3f63f72999193214c1

diff --git a/src/bin/lttng-sessiond/ust-metadata.c b/src/bin/lttng-sessiond/ust-metadata.c
index 328d6ea4c..3256c2cb7 100644
--- a/src/bin/lttng-sessiond/ust-metadata.c
+++ b/src/bin/lttng-sessiond/ust-metadata.c
@@ -28,6 +28,7 @@
 #include <unistd.h>
 #include <inttypes.h>
 #include <common/common.h>
+#include <common/time.h>
 
 #include "ust-registry.h"
 #include "ust-clock.h"
@@ -37,7 +38,6 @@
 #define max_t(type, a, b)	((type) ((a) > (b) ? (a) : (b)))
 #endif
 
-#define NSEC_PER_SEC			1000000000ULL
 #define NR_CLOCK_OFFSET_SAMPLES		10
 
 struct offset_sample {
@@ -74,7 +74,6 @@ int fls(unsigned int x)
 		r -= 2;
 	}
 	if (!(x & 0x80000000U)) {
-		x <<= 1;
 		r -= 1;
 	}
 	return r;
@@ -305,7 +304,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;
@@ -403,6 +403,9 @@ int _lttng_variant_statedump(struct ust_registry_session *session,
 	}
 	sanitize_ctf_identifier(identifier, variant->name);
 	ret = print_tabs(session, nesting);
+	if (ret) {
+		goto end;
+	}
 	ret = lttng_metadata_printf(session,
 			"} _%s;\n",
 			identifier);
@@ -818,7 +821,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;
 	}