X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fevents.c;h=8174293b28e85b80b2038ecec808c3490488636f;hp=1c4813da88147f51a00491913c03c90d47c7488f;hb=3a068915df64d2480d176ae58913f9d04d72f87c;hpb=45807148b2641aa049f821a7c71c4c7246c7692e

diff --git a/formats/ctf/events.c b/formats/ctf/events.c
index 1c4813da..8174293b 100644
--- a/formats/ctf/events.c
+++ b/formats/ctf/events.c
@@ -309,8 +309,8 @@ int bt_ctf_event_get_handle_id(const struct bt_ctf_event *ctf_event)
 	cfs = container_of(event->stream, const struct ctf_file_stream,
 			parent);
 	trace = cfs->parent.stream_class->trace;
-	if (trace->handle)
-		ret = trace->handle->id;
+	if (trace->parent.handle)
+		ret = trace->parent.handle->id;
 
 	return ret;
 }
@@ -608,6 +608,75 @@ char *bt_ctf_get_string(const struct bt_definition *field)
 	return ret;
 }
 
+double bt_ctf_get_float(const struct bt_definition *field)
+{
+	double ret = 0.0;
+
+	if (field && bt_ctf_field_type(bt_ctf_get_decl_from_def(field)) == CTF_TYPE_FLOAT) {
+		ret = bt_get_float(field);
+	} else {
+		bt_ctf_field_set_error(-EINVAL);
+	}
+
+	return ret;
+}
+
+const struct bt_definition *bt_ctf_get_variant(const struct bt_definition *field)
+{
+	const struct bt_definition *ret = NULL;
+
+	if (field && bt_ctf_field_type(
+		bt_ctf_get_decl_from_def(field)) == CTF_TYPE_VARIANT) {
+		struct definition_variant *variant = container_of(field,
+			struct definition_variant, p);
+
+		ret = bt_variant_get_current_field(variant);
+	} else {
+		bt_ctf_field_set_error(-EINVAL);
+	}
+
+	return ret;
+}
+
+uint64_t bt_ctf_get_struct_field_count(const struct bt_definition *field)
+{
+	uint64_t ret = -1;
+	const struct bt_declaration *declaration =
+		bt_ctf_get_decl_from_def(field);
+
+	if (field && bt_ctf_field_type(declaration) == CTF_TYPE_STRUCT) {
+		const struct declaration_struct *struct_declaration =
+			container_of(declaration, struct declaration_struct, p);
+
+		ret = bt_struct_declaration_len(struct_declaration);
+	} else {
+		bt_ctf_field_set_error(-EINVAL);
+	}
+
+	return ret;
+}
+
+const struct bt_definition *bt_ctf_get_struct_field_index(
+		const struct bt_definition *field, uint64_t i)
+{
+	const struct bt_definition *ret = NULL;
+
+	if (field && bt_ctf_field_type(
+		bt_ctf_get_decl_from_def(field)) == CTF_TYPE_STRUCT &&
+		i < bt_ctf_get_struct_field_count(field)) {
+		const struct definition_struct *structure = container_of(
+			field, struct definition_struct, p);
+
+		ret = bt_struct_definition_get_field_from_index(structure, i);
+	}
+
+	if (!ret) {
+		bt_ctf_field_set_error(-EINVAL);
+	}
+
+	return ret;
+}
+
 int bt_ctf_get_event_decl_list(int handle_id, struct bt_context *ctx,
 		struct bt_ctf_event_decl * const **list,
 		unsigned int *count)
@@ -653,11 +722,11 @@ int bt_ctf_get_decl_fields(struct bt_ctf_event_decl *event_decl,
 	gpointer *ret_list = NULL;
 	GPtrArray *fields_array = NULL;
 	int ret = 0;
-	*count = 0;
 
 	if (!event_decl || !list || !count)
 		return -EINVAL;
 
+	*count = 0;
 	switch (scope) {
 	case BT_EVENT_CONTEXT:
 		if (event_decl->context_decl) {