X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-metadata.c;h=86dcc0182f22e58d28c42086e0efb79adb6047de;hp=48a8cada224970acf437fb8f583008c97a16e9df;hb=5c5373c3cbfebddb0068fe13600766bb381048da;hpb=0d32d1a95331da3baf00ad1eb7be907129c6a9db

diff --git a/src/bin/lttng-sessiond/ust-metadata.c b/src/bin/lttng-sessiond/ust-metadata.c
index 48a8cada2..86dcc0182 100644
--- a/src/bin/lttng-sessiond/ust-metadata.c
+++ b/src/bin/lttng-sessiond/ust-metadata.c
@@ -36,41 +36,12 @@ int _lttng_field_statedump(struct ust_registry_session *session,
 		const struct ustctl_field *fields, size_t nr_fields,
 		size_t *iter_field, size_t nesting);
 
-static inline
-int fls(unsigned int x)
-{
-	int r = 32;
-
-	if (!x)
-		return 0;
-	if (!(x & 0xFFFF0000U)) {
-		x <<= 16;
-		r -= 16;
-	}
-	if (!(x & 0xFF000000U)) {
-		x <<= 8;
-		r -= 8;
-	}
-	if (!(x & 0xF0000000U)) {
-		x <<= 4;
-		r -= 4;
-	}
-	if (!(x & 0xC0000000U)) {
-		x <<= 2;
-		r -= 2;
-	}
-	if (!(x & 0x80000000U)) {
-		r -= 1;
-	}
-	return r;
-}
-
 static inline
 int get_count_order(unsigned int count)
 {
 	int order;
 
-	order = fls(count) - 1;
+	order = lttng_fls(count) - 1;
 	if (count & (count - 1)) {
 		order++;
 	}
@@ -192,7 +163,7 @@ void sanitize_ctf_identifier(char *out, const char *in)
 {
 	size_t i;
 
-	for (i = 0; i < LTTNG_UST_SYM_NAME_LEN; i++) {
+	for (i = 0; i < LTTNG_UST_ABI_SYM_NAME_LEN; i++) {
 		switch (in[i]) {
 		case '.':
 		case '$':
@@ -255,7 +226,7 @@ int ust_metadata_enum_statedump(struct ust_registry_session *session,
 	size_t nr_entries;
 	int ret = 0;
 	size_t i;
-	char identifier[LTTNG_UST_SYM_NAME_LEN];
+	char identifier[LTTNG_UST_ABI_SYM_NAME_LEN];
 
 	rcu_read_lock();
 	reg_enum = ust_registry_lookup_enum_by_id(session, enum_name, enum_id);
@@ -396,7 +367,7 @@ int _lttng_variant_statedump(struct ust_registry_session *session,
 	const struct ustctl_field *variant = &fields[*iter_field];
 	uint32_t i;
 	int ret;
-	char identifier[LTTNG_UST_SYM_NAME_LEN];
+	char identifier[LTTNG_UST_ABI_SYM_NAME_LEN];
 
 	if (variant->type.atype != ustctl_atype_variant) {
 		ret = -EINVAL;