X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fevents.c;h=39620383879b3aae0076bb9aedf710e2d9c88d22;hp=27643fcbc61f513ce6d7cc0b021e7d6aea4bd053;hb=305c65e5d7156ae7936f07ad93dd45ac318b4ce2;hpb=e419579102094d83539d79ce6af83d9786d387ee

diff --git a/formats/ctf/events.c b/formats/ctf/events.c
index 27643fcb..39620383 100644
--- a/formats/ctf/events.c
+++ b/formats/ctf/events.c
@@ -29,6 +29,8 @@
 #include <babeltrace/ctf/metadata.h>
 #include <glib.h>
 
+#include "events-private.h"
+
 /*
  * thread local storage to store the last error that occured
  * while reading a field, this variable must be accessed by
@@ -49,11 +51,39 @@ struct bt_ctf_iter *bt_ctf_iter_create(struct bt_context *ctx,
 		g_free(iter);
 		return NULL;
 	}
+	iter->callbacks = g_array_new(0, 1, sizeof(struct bt_stream_callbacks));
+	iter->recalculate_dep_graph = 0;
+	iter->main_callbacks.callback = NULL;
+	iter->dep_gc = g_ptr_array_new();
 	return iter;
 }
 
 void bt_ctf_iter_destroy(struct bt_ctf_iter *iter)
 {
+	struct bt_stream_callbacks *bt_stream_cb;
+	struct bt_callback_chain *bt_chain;
+	int i, j;
+
+	/* free all events callbacks */
+	if (iter->main_callbacks.callback)
+		g_array_free(iter->main_callbacks.callback, TRUE);
+
+	/* free per-event callbacks */
+	for (i = 0; i < iter->callbacks->len; i++) {
+		bt_stream_cb = &g_array_index(iter->callbacks,
+				struct bt_stream_callbacks, i);
+		if (!bt_stream_cb || !bt_stream_cb->per_id_callbacks)
+			continue;
+		for (j = 0; j < bt_stream_cb->per_id_callbacks->len; j++) {
+			bt_chain = &g_array_index(bt_stream_cb->per_id_callbacks,
+					struct bt_callback_chain, j);
+			if (bt_chain->callback) {
+				g_array_free(bt_chain->callback, TRUE);
+			}
+		}
+		g_array_free(bt_stream_cb->per_id_callbacks, TRUE);
+	}
+
 	bt_iter_fini(&iter->parent);
 	g_free(iter);
 }
@@ -77,10 +107,10 @@ struct bt_ctf_event *bt_ctf_iter_read_event(struct bt_ctf_iter *iter)
 	ret->event = g_ptr_array_index(ret->stream->events_by_id,
 			ret->stream->event_id);
 
-	if (ret->stream->stream_id > iter->parent.callbacks->len)
+	if (ret->stream->stream_id > iter->callbacks->len)
 		goto end;
 
-	process_callbacks(&iter->parent, ret->stream);
+	process_callbacks(iter, ret->stream);
 
 end:
 	return ret;
@@ -196,7 +226,7 @@ const char *bt_ctf_field_name(const struct definition *def)
 	return NULL;
 }
 
-enum ctf_type_id bt_ctf_field_type(struct definition *def)
+enum ctf_type_id bt_ctf_field_type(const struct definition *def)
 {
 	if (def)
 		return def->declaration->id;
@@ -289,12 +319,22 @@ error:
 	return -1;
 }
 
+uint64_t bt_ctf_get_timestamp_raw(struct bt_ctf_event *event)
+{
+	if (event && event->stream->has_timestamp)
+		return ctf_get_timestamp_raw(event->stream,
+				event->stream->timestamp);
+	else
+		return -1ULL;
+}
+
 uint64_t bt_ctf_get_timestamp(struct bt_ctf_event *event)
 {
 	if (event && event->stream->has_timestamp)
-		return event->stream->timestamp;
+		return ctf_get_timestamp(event->stream,
+				event->stream->timestamp);
 	else
-		return 0;
+		return -1ULL;
 }
 
 static void bt_ctf_field_set_error(int error)
@@ -311,7 +351,7 @@ int bt_ctf_field_get_error(void)
 	return ret;
 }
 
-uint64_t bt_ctf_get_uint64(struct definition *field)
+uint64_t bt_ctf_get_uint64(const struct definition *field)
 {
 	unsigned int ret = 0;
 
@@ -323,7 +363,7 @@ uint64_t bt_ctf_get_uint64(struct definition *field)
 	return ret;
 }
 
-int64_t bt_ctf_get_int64(struct definition *field)
+int64_t bt_ctf_get_int64(const struct definition *field)
 {
 	int ret = 0;
 
@@ -336,7 +376,7 @@ int64_t bt_ctf_get_int64(struct definition *field)
 
 }
 
-char *bt_ctf_get_char_array(struct definition *field)
+char *bt_ctf_get_char_array(const struct definition *field)
 {
 	char *ret = NULL;
 
@@ -348,7 +388,7 @@ char *bt_ctf_get_char_array(struct definition *field)
 	return ret;
 }
 
-char *bt_ctf_get_string(struct definition *field)
+char *bt_ctf_get_string(const struct definition *field)
 {
 	char *ret = NULL;