X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fevents.c;h=b837b128393baf87905c81b28fc444cb2f434c42;hp=15882eeffd20c2400de32af077e2879402165095;hb=c22b9327cbc4e6d9053f998952ea71c3227b8e36;hpb=8b8dc96e023c365461d2407a3bf2220779bc7d05

diff --git a/formats/ctf/events.c b/formats/ctf/events.c
index 15882eef..b837b128 100644
--- a/formats/ctf/events.c
+++ b/formats/ctf/events.c
@@ -34,15 +34,20 @@
 /*
  * thread local storage to store the last error that occured
  * while reading a field, this variable must be accessed by
- * bt_ctf_field_error only
+ * bt_ctf_field_get_error only
  */
 __thread int bt_ctf_last_field_error = 0;
 
-const struct definition *bt_ctf_get_top_level_scope(const struct bt_ctf_event *event,
+const struct definition *bt_ctf_get_top_level_scope(const struct bt_ctf_event *ctf_event,
 		enum bt_ctf_scope scope)
 {
-	struct definition *tmp = NULL;
+	const struct definition *tmp = NULL;
+	const struct ctf_event_definition *event;
 
+	if (!ctf_event)
+		return NULL;
+
+	event = ctf_event->parent;
 	switch (scope) {
 	case BT_TRACE_PACKET_HEADER:
 		if (!event->stream)
@@ -69,16 +74,12 @@ const struct definition *bt_ctf_get_top_level_scope(const struct bt_ctf_event *e
 			tmp = &event->stream->stream_event_context->p;
 		break;
 	case BT_EVENT_CONTEXT:
-		if (!event->event)
-			goto error;
-		if (event->event->event_context)
-			tmp = &event->event->event_context->p;
+		if (event->event_context)
+			tmp = &event->event_context->p;
 		break;
 	case BT_EVENT_FIELDS:
-		if (!event->event)
-			goto error;
-		if (event->event->event_fields)
-			tmp = &event->event->event_fields->p;
+		if (event->event_fields)
+			tmp = &event->event_fields->p;
 		break;
 	}
 	return tmp;
@@ -87,49 +88,52 @@ error:
 	return NULL;
 }
 
-const struct definition *bt_ctf_get_field(const struct bt_ctf_event *event,
+const struct definition *bt_ctf_get_field(const struct bt_ctf_event *ctf_event,
 		const struct definition *scope,
 		const char *field)
 {
-	struct definition *def;
+	const struct definition *def;
 	char *field_underscore;
 
-	if (scope) {
-		def = lookup_definition(scope, field);
-		/*
-		 * optionally a field can have an underscore prefix, try
-		 * to lookup the field with this prefix if it failed
-		 */
-		if (!def) {
-			field_underscore = g_new(char, strlen(field) + 2);
-			field_underscore[0] = '_';
-			strcpy(&field_underscore[1], field);
-			def = lookup_definition(scope, field_underscore);
-			g_free(field_underscore);
-		}
-		if (bt_ctf_field_type(def) == CTF_TYPE_VARIANT) {
-			struct definition_variant *variant_definition;
-			variant_definition = container_of(def,
-					struct definition_variant, p);
-			return variant_definition->current_field;
-		}
-		return def;
+	if (!ctf_event || !scope || !field)
+		return NULL;
+
+	def = lookup_definition(scope, field);
+	/*
+	 * optionally a field can have an underscore prefix, try
+	 * to lookup the field with this prefix if it failed
+	 */
+	if (!def) {
+		field_underscore = g_new(char, strlen(field) + 2);
+		field_underscore[0] = '_';
+		strcpy(&field_underscore[1], field);
+		def = lookup_definition(scope, field_underscore);
+		g_free(field_underscore);
 	}
-	return NULL;
+	if (bt_ctf_field_type(bt_ctf_get_decl_from_def(def)) == CTF_TYPE_VARIANT) {
+		const struct definition_variant *variant_definition;
+		variant_definition = container_of(def,
+				const struct definition_variant, p);
+		return variant_definition->current_field;
+	}
+	return def;
 }
 
-const struct definition *bt_ctf_get_index(const struct bt_ctf_event *event,
+const struct definition *bt_ctf_get_index(const struct bt_ctf_event *ctf_event,
 		const struct definition *field,
 		unsigned int index)
 {
 	struct definition *ret = NULL;
 
-	if (bt_ctf_field_type(field) == CTF_TYPE_ARRAY) {
+	if (!ctf_event || !field)
+		return NULL;
+
+	if (bt_ctf_field_type(bt_ctf_get_decl_from_def(field)) == CTF_TYPE_ARRAY) {
 		struct definition_array *array_definition;
 		array_definition = container_of(field,
 				struct definition_array, p);
 		ret = array_index(array_definition, index);
-	} else if (bt_ctf_field_type(field) == CTF_TYPE_SEQUENCE) {
+	} else if (bt_ctf_field_type(bt_ctf_get_decl_from_def(field)) == CTF_TYPE_SEQUENCE) {
 		struct definition_sequence *sequence_definition;
 		sequence_definition = container_of(field,
 				struct definition_sequence, p);
@@ -138,13 +142,16 @@ const struct definition *bt_ctf_get_index(const struct bt_ctf_event *event,
 	return ret;
 }
 
-const char *bt_ctf_event_name(const struct bt_ctf_event *event)
+const char *bt_ctf_event_name(const struct bt_ctf_event *ctf_event)
 {
-	struct ctf_event *event_class;
-	struct ctf_stream_class *stream_class;
+	const struct ctf_event_declaration *event_class;
+	const struct ctf_stream_declaration *stream_class;
+	const struct ctf_event_definition *event;
 
-	if (!event)
+	if (!ctf_event)
 		return NULL;
+
+	event = ctf_event->parent;
 	stream_class = event->stream->stream_class;
 	event_class = g_ptr_array_index(stream_class->events_by_id,
 			event->stream->event_id);
@@ -153,24 +160,29 @@ const char *bt_ctf_event_name(const struct bt_ctf_event *event)
 
 const char *bt_ctf_field_name(const struct definition *def)
 {
-	if (def)
-		return rem_(g_quark_to_string(def->name));
-	return NULL;
+	if (!def)
+		return NULL;
+
+	return rem_(g_quark_to_string(def->name));
 }
 
-enum ctf_type_id bt_ctf_field_type(const struct definition *def)
+enum ctf_type_id bt_ctf_field_type(const struct declaration *decl)
 {
-	if (def)
-		return def->declaration->id;
-	return CTF_TYPE_UNKNOWN;
+	if (!decl)
+		return CTF_TYPE_UNKNOWN;
+
+	return decl->id;
 }
 
-int bt_ctf_get_field_list(const struct bt_ctf_event *event,
+int bt_ctf_get_field_list(const struct bt_ctf_event *ctf_event,
 		const struct definition *scope,
 		struct definition const * const **list,
 		unsigned int *count)
 {
-	switch (bt_ctf_field_type(scope)) {
+	if (!ctf_event || !scope || !list || !count)
+		return -EINVAL;
+
+	switch (bt_ctf_field_type(bt_ctf_get_decl_from_def(scope))) {
 	case CTF_TYPE_INTEGER:
 	case CTF_TYPE_FLOAT:
 	case CTF_TYPE_STRING:
@@ -190,6 +202,7 @@ int bt_ctf_get_field_list(const struct bt_ctf_event *event,
 		} else {
 			goto error;
 		}
+		break;
 	}
 	case CTF_TYPE_UNTAGGED_VARIANT:
 		goto error;
@@ -207,6 +220,7 @@ int bt_ctf_get_field_list(const struct bt_ctf_event *event,
 		} else {
 			goto error;
 		}
+		break;
 	}
 	case CTF_TYPE_ARRAY:
 	{
@@ -222,6 +236,7 @@ int bt_ctf_get_field_list(const struct bt_ctf_event *event,
 		} else {
 			goto error;
 		}
+		break;
 	}
 	case CTF_TYPE_SEQUENCE:
 	{
@@ -237,6 +252,7 @@ int bt_ctf_get_field_list(const struct bt_ctf_event *event,
 		} else {
 			goto error;
 		}
+		break;
 	}
 	default:
 		break;
@@ -251,13 +267,18 @@ error:
 	return -1;
 }
 
-struct bt_context *bt_ctf_event_get_context(const struct bt_ctf_event *event)
+struct bt_context *bt_ctf_event_get_context(const struct bt_ctf_event *ctf_event)
 {
 	struct bt_context *ret = NULL;
-	struct ctf_file_stream *cfs;
-	struct ctf_trace *trace;
+	const struct ctf_file_stream *cfs;
+	const struct ctf_trace *trace;
+	const struct ctf_event_definition *event;
+
+	if (!ctf_event)
+		return NULL;
 
-	cfs = container_of(event->stream, struct ctf_file_stream,
+	event = ctf_event->parent;
+	cfs = container_of(event->stream, const struct ctf_file_stream,
 			parent);
 	trace = cfs->parent.stream_class->trace;
 	if (trace->ctx)
@@ -266,13 +287,18 @@ struct bt_context *bt_ctf_event_get_context(const struct bt_ctf_event *event)
 	return ret;
 }
 
-int bt_ctf_event_get_handle_id(const struct bt_ctf_event *event)
+int bt_ctf_event_get_handle_id(const struct bt_ctf_event *ctf_event)
 {
 	int ret = -1;
-	struct ctf_file_stream *cfs;
-	struct ctf_trace *trace;
+	const struct ctf_file_stream *cfs;
+	const struct ctf_trace *trace;
+	const struct ctf_event_definition *event;
 
-	cfs = container_of(event->stream, struct ctf_file_stream,
+	if (!ctf_event)
+		return -EINVAL;
+
+	event = ctf_event->parent;
+	cfs = container_of(event->stream, const struct ctf_file_stream,
 			parent);
 	trace = cfs->parent.stream_class->trace;
 	if (trace->handle)
@@ -281,20 +307,30 @@ int bt_ctf_event_get_handle_id(const struct bt_ctf_event *event)
 	return ret;
 }
 
-uint64_t bt_ctf_get_timestamp_raw(const struct bt_ctf_event *event)
+uint64_t bt_ctf_get_timestamp(const struct bt_ctf_event *ctf_event)
 {
+	const struct ctf_event_definition *event;
+
+	if (!ctf_event)
+		return -1ULL;
+
+	event = ctf_event->parent;
 	if (event && event->stream->has_timestamp)
-		return ctf_get_timestamp_raw(event->stream,
-				event->stream->timestamp);
+		return event->stream->real_timestamp;
 	else
 		return -1ULL;
 }
 
-uint64_t bt_ctf_get_timestamp(const struct bt_ctf_event *event)
+uint64_t bt_ctf_get_cycles(const struct bt_ctf_event *ctf_event)
 {
+	const struct ctf_event_definition *event;
+
+	if (!ctf_event)
+		return -1ULL;
+
+	event = ctf_event->parent;
 	if (event && event->stream->has_timestamp)
-		return ctf_get_timestamp(event->stream,
-				event->stream->timestamp);
+		return event->stream->cycles_timestamp;
 	else
 		return -1ULL;
 }
@@ -313,63 +349,182 @@ int bt_ctf_field_get_error(void)
 	return ret;
 }
 
-int bt_ctf_get_int_signedness(const struct definition *field)
+static const struct declaration_integer *
+get_declaration_integer(const struct declaration *decl)
 {
-	int ret;
+	if (!decl || bt_ctf_field_type(decl) != CTF_TYPE_INTEGER)
+		return NULL;
+	return container_of(decl, const struct declaration_integer, p);
+}
 
-	if (field && bt_ctf_field_type(field) == CTF_TYPE_INTEGER) {
-		ret = get_int_signedness(field);
-	} else {
-		ret = -1;
+static const struct declaration_string *
+get_declaration_string(const struct declaration *decl)
+{
+	if (!decl || bt_ctf_field_type(decl) != CTF_TYPE_STRING)
+		return NULL;
+	return container_of(decl, const struct declaration_string, p);
+}
+
+static const struct declaration_array *
+get_declaration_array(const struct declaration *decl)
+{
+	if (!decl || bt_ctf_field_type(decl) != CTF_TYPE_ARRAY)
+		return NULL;
+	return container_of(decl, const struct declaration_array, p);
+}
+
+static const struct declaration_sequence *
+get_declaration_sequence(const struct declaration *decl)
+{
+	if (!decl || bt_ctf_field_type(decl) != CTF_TYPE_SEQUENCE)
+		return NULL;
+	return container_of(decl, const struct declaration_sequence, p);
+}
+
+int bt_ctf_get_int_signedness(const struct declaration *decl)
+{
+	const struct declaration_integer *integer;
+
+	integer = get_declaration_integer(decl);
+	if (!integer) {
 		bt_ctf_field_set_error(-EINVAL);
+		return -EINVAL;
 	}
+	return integer->signedness;
+}
 
-	return ret;
+int bt_ctf_get_int_base(const struct declaration *decl)
+{
+	const struct declaration_integer *integer;
+
+	integer = get_declaration_integer(decl);
+	if (!integer) {
+		bt_ctf_field_set_error(-EINVAL);
+		return -EINVAL;
+	}
+	return integer->base;
 }
 
-int bt_ctf_get_int_base(const struct definition *field)
+int bt_ctf_get_int_byte_order(const struct declaration *decl)
 {
-	int ret;
+	const struct declaration_integer *integer;
 
-	if (field && bt_ctf_field_type(field) == CTF_TYPE_INTEGER) {
-		ret = get_int_base(field);
-	} else {
-		ret = -1;
+	integer = get_declaration_integer(decl);
+	if (!integer) {
 		bt_ctf_field_set_error(-EINVAL);
+		return -EINVAL;
 	}
+	return integer->byte_order;
+}
 
-	return ret;
+ssize_t bt_ctf_get_int_len(const struct declaration *decl)
+{
+	const struct declaration_integer *integer;
+
+	integer = get_declaration_integer(decl);
+	if (!integer) {
+		bt_ctf_field_set_error(-EINVAL);
+		return -EINVAL;
+	}
+	return (ssize_t) integer->len;
 }
 
-int bt_ctf_get_int_byte_order(const struct definition *field)
+const struct definition *bt_ctf_get_enum_int(const struct definition *field)
 {
-	int ret;
+	const struct definition_enum *def_enum;
 
-	if (field && bt_ctf_field_type(field) == CTF_TYPE_INTEGER) {
-		ret = get_int_byte_order(field);
-	} else {
-		ret = -1;
+	if (!field || bt_ctf_field_type(bt_ctf_get_decl_from_def(field)) != CTF_TYPE_ENUM) {
 		bt_ctf_field_set_error(-EINVAL);
+		return NULL;
+	}
+	def_enum = container_of(field, const struct definition_enum, p);
+	return &def_enum->integer->p;
+}
+
+const char *bt_ctf_get_enum_str(const struct definition *field)
+{
+	const struct definition_enum *def_enum;
+	const struct declaration_enum *decl_enum;
+	GArray *array;
+	const char *ret;
+
+	if (!field || bt_ctf_field_type(bt_ctf_get_decl_from_def(field)) != CTF_TYPE_ENUM) {
+		bt_ctf_field_set_error(-EINVAL);
+		return NULL;
+	}
+	def_enum = container_of(field, const struct definition_enum, p);
+	decl_enum = def_enum->declaration;
+	if (get_int_signedness(&def_enum->integer->p)) {
+		array = enum_int_to_quark_set(decl_enum,
+			get_signed_int(&def_enum->integer->p));
+	} else {
+		array = enum_uint_to_quark_set(decl_enum,
+			get_unsigned_int(&def_enum->integer->p));
+	}
+	if (!array) {
+		bt_ctf_field_set_error(-ENOENT);
+		return NULL;
 	}
 
+	if (array->len == 0) {
+		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);
 	return ret;
 }
 
-enum ctf_string_encoding bt_ctf_get_encoding(const struct definition *field)
+enum ctf_string_encoding bt_ctf_get_encoding(const struct declaration *decl)
 {
 	enum ctf_string_encoding ret = 0;
+	enum ctf_type_id type;
+	const struct declaration_integer *integer;
+	const struct declaration_string *string;
+	const struct declaration_array *array;
+	const struct declaration_sequence *sequence;
 
-	if (!field)
-		goto end;
-
-	if (bt_ctf_field_type(field) == CTF_TYPE_INTEGER)
-		ret = get_int_encoding(field);
-	else if (bt_ctf_field_type(field) == CTF_TYPE_STRING)
-		ret = get_string_encoding(field);
-	else
+	if (!decl)
 		goto error;
 
-end:
+	type = bt_ctf_field_type(decl);
+
+	switch (type) {
+	case CTF_TYPE_ARRAY:
+		array = get_declaration_array(decl);
+		if (!array)
+			goto error;
+		integer = get_declaration_integer(array->elem);
+		if (!integer)
+			goto error;
+		ret = integer->encoding;
+		break;
+	case CTF_TYPE_SEQUENCE:
+		sequence = get_declaration_sequence(decl);
+		if (!sequence)
+			goto error;
+		integer = get_declaration_integer(sequence->elem);
+		if (!integer)
+			goto error;
+		ret = integer->encoding;
+		break;
+	case CTF_TYPE_STRING:
+		string = get_declaration_string(decl);
+		if (!string)
+			goto error;
+		ret = string->encoding;
+		break;
+	case CTF_TYPE_INTEGER:
+		integer = get_declaration_integer(decl);
+		if (!integer)
+			goto error;
+		ret = integer->encoding;
+		break;
+	default:
+		goto error;
+	}
 	return ret;
 
 error:
@@ -377,25 +532,25 @@ error:
 	return -1;
 }
 
-int bt_ctf_get_array_len(const struct definition *field)
+int bt_ctf_get_array_len(const struct declaration *decl)
 {
-	int ret;
+	const struct declaration_array *array;
 
-	if (field && bt_ctf_field_type(field) == CTF_TYPE_ARRAY) {
-		ret = get_array_len(field);
-	} else {
-		ret = -1;
-		bt_ctf_field_set_error(-EINVAL);
-	}
+	array = get_declaration_array(decl);
+	if (!array)
+		goto error;
+	return array->len;
 
-	return ret;
+error:
+	bt_ctf_field_set_error(-EINVAL);
+	return -1;
 }
 
 uint64_t bt_ctf_get_uint64(const struct definition *field)
 {
-	unsigned int ret = 0;
+	uint64_t ret = 0;
 
-	if (field && bt_ctf_field_type(field) == CTF_TYPE_INTEGER)
+	if (field && bt_ctf_field_type(bt_ctf_get_decl_from_def(field)) == CTF_TYPE_INTEGER)
 		ret = get_unsigned_int(field);
 	else
 		bt_ctf_field_set_error(-EINVAL);
@@ -405,26 +560,31 @@ uint64_t bt_ctf_get_uint64(const struct definition *field)
 
 int64_t bt_ctf_get_int64(const struct definition *field)
 {
-	int ret = 0;
+	int64_t ret = 0;
 
-	if (field && bt_ctf_field_type(field) == CTF_TYPE_INTEGER)
+	if (field && bt_ctf_field_type(bt_ctf_get_decl_from_def(field)) == CTF_TYPE_INTEGER)
 		ret = get_signed_int(field);
 	else
 		bt_ctf_field_set_error(-EINVAL);
 
 	return ret;
-
 }
 
 char *bt_ctf_get_char_array(const struct definition *field)
 {
 	char *ret = NULL;
+	GString *char_array;
 
-	if (field && bt_ctf_field_type(field) == CTF_TYPE_ARRAY)
-		ret = get_char_array(field)->str;
-	else
-		bt_ctf_field_set_error(-EINVAL);
+	if (field && bt_ctf_field_type(bt_ctf_get_decl_from_def(field)) == CTF_TYPE_ARRAY) {
+		char_array = get_char_array(field);
+		if (char_array) {
+			ret = char_array->str;
+			goto end;
+		}
+	}
+	bt_ctf_field_set_error(-EINVAL);
 
+end:
 	return ret;
 }
 
@@ -432,10 +592,186 @@ char *bt_ctf_get_string(const struct definition *field)
 {
 	char *ret = NULL;
 
-	if (field && bt_ctf_field_type(field) == CTF_TYPE_STRING)
+	if (field && bt_ctf_field_type(bt_ctf_get_decl_from_def(field)) == CTF_TYPE_STRING)
 		ret = get_string(field);
 	else
 		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)
+{
+	struct bt_trace_handle *handle;
+	struct trace_descriptor *td;
+	struct ctf_trace *tin;
+
+	if (!ctx || !list || !count)
+		goto error;
+
+	handle = g_hash_table_lookup(ctx->trace_handles,
+			(gpointer) (unsigned long) handle_id);
+	if (!handle)
+		goto error;
+
+	td = handle->td;
+	tin = container_of(td, struct ctf_trace, parent);
+
+	*list = (struct bt_ctf_event_decl * const*) tin->event_declarations->pdata;
+	*count = tin->event_declarations->len;
+	return 0;
+
+error:
+	return -1;
+}
+
+const char *bt_ctf_get_decl_event_name(const struct bt_ctf_event_decl *event)
+{
+	if (!event)
+		return NULL;
+
+	return g_quark_to_string(event->parent.name);
+}
+
+int bt_ctf_get_decl_fields(struct bt_ctf_event_decl *event_decl,
+		enum bt_ctf_scope scope,
+		struct bt_ctf_field_decl const * const **list,
+		unsigned int *count)
+{
+	int i;
+	GArray *fields = NULL;
+	gpointer *ret_list = NULL;
+	GPtrArray *fields_array = NULL;
+	int ret = 0;
+	*count = 0;
+
+	if (!event_decl || !list || !count)
+		return -EINVAL;
+
+	switch (scope) {
+	case BT_EVENT_CONTEXT:
+		if (event_decl->context_decl) {
+			ret_list = event_decl->context_decl->pdata;
+			*count = event_decl->context_decl->len;
+			goto end;
+		}
+		event_decl->context_decl = g_ptr_array_new();
+		if (!event_decl->parent.context_decl) {
+			ret = -1;
+			goto end;
+		}
+		fields = event_decl->parent.context_decl->fields;
+		fields_array = event_decl->context_decl;
+		break;
+	case BT_EVENT_FIELDS:
+		if (event_decl->fields_decl) {
+			ret_list = event_decl->fields_decl->pdata;
+			*count = event_decl->fields_decl->len;
+			goto end;
+		}
+		event_decl->fields_decl = g_ptr_array_new();
+		if (!event_decl->parent.fields_decl) {
+			ret = -1;
+			goto end;
+		}
+		fields = event_decl->parent.fields_decl->fields;
+		fields_array = event_decl->fields_decl;
+		break;
+	case BT_STREAM_PACKET_CONTEXT:
+		if (event_decl->packet_context_decl) {
+			ret_list = event_decl->packet_context_decl->pdata;
+			*count = event_decl->packet_context_decl->len;
+			goto end;
+		}
+		event_decl->packet_context_decl = g_ptr_array_new();
+		if (!event_decl->parent.stream->packet_context_decl) {
+			ret = -1;
+			goto end;
+		}
+		fields = event_decl->parent.stream->packet_context_decl->fields;
+		fields_array = event_decl->packet_context_decl;
+		break;
+	case BT_STREAM_EVENT_CONTEXT:
+		if (event_decl->event_context_decl) {
+			ret_list = event_decl->event_context_decl->pdata;
+			*count = event_decl->event_context_decl->len;
+			goto end;
+		}
+		event_decl->event_context_decl = g_ptr_array_new();
+		if (!event_decl->parent.stream->event_context_decl) {
+			ret = -1;
+			goto end;
+		}
+		fields = event_decl->parent.stream->event_context_decl->fields;
+		fields_array = event_decl->event_context_decl;
+		break;
+	case BT_STREAM_EVENT_HEADER:
+		if (event_decl->event_header_decl) {
+			ret_list = event_decl->event_header_decl->pdata;
+			*count = event_decl->event_header_decl->len;
+			goto end;
+		}
+		event_decl->event_header_decl = g_ptr_array_new();
+		if (!event_decl->parent.stream->event_header_decl) {
+			ret = -1;
+			goto end;
+		}
+		fields = event_decl->parent.stream->event_header_decl->fields;
+		fields_array = event_decl->event_header_decl;
+		break;
+	case BT_TRACE_PACKET_HEADER:
+		if (event_decl->packet_header_decl) {
+			ret_list = event_decl->packet_header_decl->pdata;
+			*count = event_decl->packet_header_decl->len;
+			goto end;
+		}
+		event_decl->packet_header_decl = g_ptr_array_new();
+		if (!event_decl->parent.stream->trace->packet_header_decl) {
+			ret = -1;
+			goto end;
+		}
+		fields = event_decl->parent.stream->trace->packet_header_decl->fields;
+		fields_array = event_decl->packet_header_decl;
+		break;
+	}
+
+	for (i = 0; i < fields->len; i++) {
+		g_ptr_array_add(fields_array,
+				&g_array_index(fields,
+					struct declaration_field, i));
+	}
+	ret_list = fields_array->pdata;
+	*count = fields->len;
+
+end:
+	*list = (struct bt_ctf_field_decl const* const*) ret_list;
+
+	return ret;
+}
+
+const char *bt_ctf_get_decl_field_name(const struct bt_ctf_field_decl *field)
+{
+	if (!field)
+		return NULL;
+
+	return rem_(g_quark_to_string(((struct declaration_field *) field)->name));
+}
+
+const struct declaration *bt_ctf_get_decl_from_def(const struct definition *def)
+{
+	if (def)
+		return def->declaration;
+
+	return NULL;
+}
+
+const struct declaration *bt_ctf_get_decl_from_field_decl(
+		const struct bt_ctf_field_decl *field)
+{
+	if (field)
+		return ((struct declaration_field *) field)->declaration;
+
+	return NULL;
+}