X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fevents.c;h=d8e8d5dd1ffb1e38cbac6d90badec8f49e3fa2cb;hb=40af9f9fb5d827c8c58e32efd6fca204da1194c8;hp=f38278aadc6d64ebd4be1f5d9165bf31b313f339;hpb=812e668277c70fdaf7124b2e58f3562f82cb2dac;p=babeltrace.git

diff --git a/formats/ctf/events.c b/formats/ctf/events.c
index f38278aa..d8e8d5dd 100644
--- a/formats/ctf/events.c
+++ b/formats/ctf/events.c
@@ -47,7 +47,7 @@
 __thread int bt_ctf_last_field_error = 0;
 
 const struct bt_definition *bt_ctf_get_top_level_scope(const struct bt_ctf_event *ctf_event,
-		enum bt_ctf_scope scope)
+		enum ctf_scope scope)
 {
 	const struct bt_definition *tmp = NULL;
 	const struct ctf_event_definition *event;
@@ -255,7 +255,7 @@ int bt_ctf_get_field_list(const struct bt_ctf_event *ctf_event,
 			goto error;
 		if (def_sequence->elems->pdata) {
 			*list = (struct bt_definition const* const*) def_sequence->elems->pdata;
-			*count = def_sequence->elems->len;
+			*count = (unsigned int) def_sequence->length->value._unsigned;
 			goto end;
 		} else {
 			goto error;
@@ -315,18 +315,19 @@ int bt_ctf_event_get_handle_id(const struct bt_ctf_event *ctf_event)
 	return ret;
 }
 
-uint64_t bt_ctf_get_timestamp(const struct bt_ctf_event *ctf_event)
+int bt_ctf_get_timestamp(const struct bt_ctf_event *ctf_event, int64_t *timestamp)
 {
 	const struct ctf_event_definition *event;
 
-	if (!ctf_event)
-		return -1ULL;
+	if (!ctf_event || !timestamp)
+		return -1;
 
 	event = ctf_event->parent;
 	if (event && event->stream->has_timestamp)
-		return event->stream->real_timestamp;
+		*timestamp = event->stream->real_timestamp;
 	else
-		return -1ULL;
+		return -1;
+	return 0;
 }
 
 uint64_t bt_ctf_get_cycles(const struct bt_ctf_event *ctf_event)
@@ -478,7 +479,7 @@ const char *bt_ctf_get_enum_str(const struct bt_definition *field)
 		g_array_unref(array);
 		bt_ctf_field_set_error(-ENOENT);
 		return NULL;
-	}	
+	}
 	/* Return first string. Arbitrary choice. */
 	ret = g_quark_to_string(g_array_index(array, GQuark, 0));
 	g_array_unref(array);
@@ -637,6 +638,18 @@ const struct bt_definition *bt_ctf_get_variant(const struct bt_definition *field
 
 	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);
 	}
@@ -644,6 +657,27 @@ const struct bt_definition *bt_ctf_get_variant(const struct bt_definition *field
 	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)
@@ -679,8 +713,16 @@ const char *bt_ctf_get_decl_event_name(const struct bt_ctf_event_decl *event)
 	return g_quark_to_string(event->parent.name);
 }
 
+uint64_t bt_ctf_get_decl_event_id(const struct bt_ctf_event_decl *event)
+{
+	if (!event)
+		return (uint64_t)(-1);
+
+	return event->parent.id;
+}
+
 int bt_ctf_get_decl_fields(struct bt_ctf_event_decl *event_decl,
-		enum bt_ctf_scope scope,
+		enum ctf_scope scope,
 		struct bt_ctf_field_decl const * const **list,
 		unsigned int *count)
 {