X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fevents.c;h=a8b08f657680ec4ddfffe282726ff8ac2de7a988;hp=13c7411a1fe2c89e462cc0a686236be8dd0989fa;hb=63dd3817d2f75681ece99d683e4944e66e4153a2;hpb=e003ab503def7b0db6c130cccbc03685adb32bbb

diff --git a/formats/ctf/events.c b/formats/ctf/events.c
index 13c7411a..a8b08f65 100644
--- a/formats/ctf/events.c
+++ b/formats/ctf/events.c
@@ -281,22 +281,20 @@ int bt_ctf_event_get_handle_id(const struct bt_ctf_event *ctf_event)
 	return ret;
 }
 
-uint64_t bt_ctf_get_timestamp_raw(const struct bt_ctf_event *ctf_event)
+uint64_t bt_ctf_get_timestamp(const struct bt_ctf_event *ctf_event)
 {
 	struct ctf_event_definition *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 *ctf_event)
+uint64_t bt_ctf_get_cycles(const struct bt_ctf_event *ctf_event)
 {
 	struct ctf_event_definition *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;
 }
@@ -357,6 +355,20 @@ int bt_ctf_get_int_byte_order(const struct definition *field)
 	return ret;
 }
 
+ssize_t bt_ctf_get_int_len(const struct definition *field)
+{
+	ssize_t ret;
+
+	if (field && bt_ctf_field_type(field) == CTF_TYPE_INTEGER) {
+		ret = (ssize_t) get_int_len(field);
+	} else {
+		ret = -1;
+		bt_ctf_field_set_error(-EINVAL);
+	}
+
+	return ret;
+}
+
 enum ctf_string_encoding bt_ctf_get_encoding(const struct definition *field)
 {
 	enum ctf_string_encoding ret = 0;
@@ -395,7 +407,7 @@ int bt_ctf_get_array_len(const struct definition *field)
 
 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)
 		ret = get_unsigned_int(field);
@@ -407,7 +419,7 @@ 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)
 		ret = get_signed_int(field);
@@ -443,7 +455,7 @@ char *bt_ctf_get_string(const struct definition *field)
 }
 
 int bt_ctf_get_event_decl_list(int handle_id, struct bt_context *ctx,
-		struct bt_ctf_event_decl const * const **list,
+		struct bt_ctf_event_decl * const **list,
 		unsigned int *count)
 {
 	struct bt_trace_handle *handle;
@@ -461,7 +473,7 @@ int bt_ctf_get_event_decl_list(int handle_id, struct bt_context *ctx,
 	td = handle->td;
 	tin = container_of(td, struct ctf_trace, parent);
 
-	*list = (struct bt_ctf_event_decl const* const*) tin->event_declarations->pdata;
+	*list = (struct bt_ctf_event_decl * const*) tin->event_declarations->pdata;
 	*count = tin->event_declarations->len;
 	return 0;
 
@@ -475,3 +487,123 @@ const char *bt_ctf_get_decl_event_name(const struct bt_ctf_event_decl *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;
+
+	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 rem_(g_quark_to_string(((struct declaration_field *) field)->name));
+	return NULL;
+}