X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-registry.c;h=e1984af5f6d68f2290c605929a0bd046a541f953;hb=5c5373c3cbfebddb0068fe13600766bb381048da;hp=2013902e9effa52b6e3c38c1d95ef03b3f68221b;hpb=ab5be9fa2eb5ba9600a82cd18fd3cfcbac69169a;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-registry.c b/src/bin/lttng-sessiond/ust-registry.c
index 2013902e9..e1984af5f 100644
--- a/src/bin/lttng-sessiond/ust-registry.c
+++ b/src/bin/lttng-sessiond/ust-registry.c
@@ -149,7 +149,7 @@ static int ht_match_enum(struct cds_lfht_node *node, const void *_key)
 	assert(_enum);
 	key = _key;
 
-	if (strncmp(_enum->name, key->name, LTTNG_UST_SYM_NAME_LEN)) {
+	if (strncmp(_enum->name, key->name, LTTNG_UST_ABI_SYM_NAME_LEN)) {
 		goto no_match;
 	}
 	if (compare_enums(_enum, key)) {
@@ -222,9 +222,20 @@ int validate_event_field(struct ustctl_field *field,
 	case ustctl_atype_sequence:
 	case ustctl_atype_string:
 	case ustctl_atype_variant:
+	case ustctl_atype_array_nestable:
+	case ustctl_atype_sequence_nestable:
+	case ustctl_atype_enum_nestable:
+	case ustctl_atype_variant_nestable:
 		break;
 	case ustctl_atype_struct:
-		if (field->type.u._struct.nr_fields != 0) {
+		if (field->type.u.legacy._struct.nr_fields != 0) {
+			WARN("Unsupported non-empty struct field.");
+			ret = -EINVAL;
+			goto end;
+		}
+		break;
+	case ustctl_atype_struct_nestable:
+		if (field->type.u.struct_nestable.nr_fields != 0) {
 			WARN("Unsupported non-empty struct field.");
 			ret = -EINVAL;
 			goto end;
@@ -232,12 +243,12 @@ int validate_event_field(struct ustctl_field *field,
 		break;
 
 	case ustctl_atype_float:
-		switch (field->type.u.basic._float.mant_dig) {
+		switch (field->type.u._float.mant_dig) {
 		case 0:
 			WARN("UST application '%s' (pid: %d) has unknown float mantissa '%u' "
 				"in field '%s', rejecting event '%s'",
 				app->name, app->pid,
-				field->type.u.basic._float.mant_dig,
+				field->type.u._float.mant_dig,
 				field->name,
 				event_name);
 			ret = -EINVAL;
@@ -573,8 +584,8 @@ struct ust_registry_enum *
 	struct ust_registry_enum reg_enum_lookup;
 
 	memset(&reg_enum_lookup, 0, sizeof(reg_enum_lookup));
-	strncpy(reg_enum_lookup.name, enum_name, LTTNG_UST_SYM_NAME_LEN);
-	reg_enum_lookup.name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
+	strncpy(reg_enum_lookup.name, enum_name, LTTNG_UST_ABI_SYM_NAME_LEN);
+	reg_enum_lookup.name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] = '\0';
 	reg_enum_lookup.id = enum_id;
 	cds_lfht_lookup(session->enums->ht,
 			ht_hash_enum((void *) &reg_enum_lookup, lttng_ht_seed),
@@ -628,8 +639,8 @@ int ust_registry_create_or_find_enum(struct ust_registry_session *session,
 		ret = -ENOMEM;
 		goto end;
 	}
-	strncpy(reg_enum->name, enum_name, LTTNG_UST_SYM_NAME_LEN);
-	reg_enum->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
+	strncpy(reg_enum->name, enum_name, LTTNG_UST_ABI_SYM_NAME_LEN);
+	reg_enum->name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] = '\0';
 	/* entries will be owned by reg_enum. */
 	reg_enum->entries = entries;
 	reg_enum->nr_entries = nr_entries;
@@ -721,20 +732,23 @@ static void destroy_channel(struct ust_registry_channel *chan, bool notif)
 
 	if (notif) {
 		cmd_ret = notification_thread_command_remove_channel(
-				notification_thread_handle, chan->consumer_key,
-				LTTNG_DOMAIN_UST);
+				the_notification_thread_handle,
+				chan->consumer_key, LTTNG_DOMAIN_UST);
 		if (cmd_ret != LTTNG_OK) {
 			ERR("Failed to remove channel from notification thread");
 		}
 	}
 
-	rcu_read_lock();
-	/* Destroy all event associated with this registry. */
-	cds_lfht_for_each_entry(chan->ht->ht, &iter.iter, event, node.node) {
-		/* Delete the node from the ht and free it. */
-		ust_registry_destroy_event(chan, event);
+	if (chan->ht) {
+		rcu_read_lock();
+		/* Destroy all event associated with this registry. */
+		cds_lfht_for_each_entry(
+				chan->ht->ht, &iter.iter, event, node.node) {
+			/* Delete the node from the ht and free it. */
+			ust_registry_destroy_event(chan, event);
+		}
+		rcu_read_unlock();
 	}
-	rcu_read_unlock();
 	call_rcu(&chan->rcu_head, destroy_channel_rcu);
 }