X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace-lib.c;h=518ec6129dcaf622e072ebeac0613cd5ad8c6361;hp=176eff3cf9319712a0956bb914d7548bc8695dbe;hb=8d8ed9afdf03dc0808e25c0e68279bb31d54742f;hpb=8ee2fac4c2d886e6f5eb72f5c29fc284e267f791

diff --git a/converter/babeltrace-lib.c b/converter/babeltrace-lib.c
index 176eff3c..518ec612 100644
--- a/converter/babeltrace-lib.c
+++ b/converter/babeltrace-lib.c
@@ -34,6 +34,8 @@
 #include <babeltrace/ctf-ir/metadata.h>
 #include <stdarg.h>
 
+int babeltrace_verbose, babeltrace_debug;
+
 struct stream_saved_pos {
 	/*
 	 * Use file_stream pointer to check if the trace collection we
@@ -56,7 +58,8 @@ struct bt_callback {
 	struct bt_dependencies *depends;
 	struct bt_dependencies *weak_depends;
 	struct bt_dependencies *provides;
-	enum bt_cb_ret (*callback)(void *private_data, void *caller_data);
+	enum bt_cb_ret (*callback)(struct bt_ctf_data *ctf_data,
+				   void *private_data);
 };
 
 struct bt_callback_chain {
@@ -138,7 +141,8 @@ struct bt_dependencies *babeltrace_dependencies_create(const char *first, ...)
  */
 int babeltrace_iter_add_callback(struct babeltrace_iter *iter,
 		bt_event_name event, void *private_data, int flags,
-		enum bt_cb_ret (*callback)(void *private_data, void *caller_data),
+		enum bt_cb_ret (*callback)(struct bt_ctf_data *ctf_data,
+					   void *private_data),
 		struct bt_dependencies *depends,
 		struct bt_dependencies *weak_depends,
 		struct bt_dependencies *provides)
@@ -188,7 +192,7 @@ int babeltrace_iter_add_callback(struct babeltrace_iter *iter,
 					printf("event not found\n");
 					continue;
 				}
-				event_id = (uint64_t)*event_id_ptr;
+				event_id = (uint64_t)(unsigned long)*event_id_ptr;
 
 				/* find or create the bt_callback_chain for this event */
 				if (bt_stream_cb->per_id_callbacks->len >= event_id) {
@@ -275,7 +279,7 @@ static int babeltrace_filestream_seek(struct ctf_file_stream *file_stream,
 		 */
 		break;
 	case BT_SEEK_BEGIN:
-		ctf_move_pos_slow(&file_stream->pos, 0, SEEK_SET);
+		file_stream->pos.move_pos_slow(&file_stream->pos, 0, SEEK_SET);
 		ret = stream_read_event(file_stream);
 		break;
 	case BT_SEEK_TIME:
@@ -406,8 +410,33 @@ error_malloc:
 
 void babeltrace_iter_destroy(struct babeltrace_iter *iter)
 {
+	struct bt_stream_callbacks *bt_stream_cb;
+	struct bt_callback_chain *bt_chain;
+	int i, j;
+
 	heap_free(iter->stream_heap);
 	g_free(iter->stream_heap);
+
+	/* 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);
+	}
+
 	free(iter);
 }
 
@@ -440,15 +469,45 @@ end:
 	return ret;
 }
 
+static
+struct ctf_stream_event *extract_ctf_stream_event(struct ctf_stream *stream)
+{
+	struct ctf_stream_class *stream_class = stream->stream_class;
+	struct ctf_event *event_class;
+	struct ctf_stream_event *event;
+	uint64_t id = stream->event_id;
+
+	if (id >= stream_class->events_by_id->len) {
+		fprintf(stdout, "[error] Event id %" PRIu64 " is outside range.\n", id);
+		return NULL;
+	}
+	event = g_ptr_array_index(stream->events_by_id, id);
+	if (!event) {
+		fprintf(stdout, "[error] Event id %" PRIu64 " is unknown.\n", id);
+		return NULL;
+	}
+	event_class = g_ptr_array_index(stream_class->events_by_id, id);
+	if (!event_class) {
+		fprintf(stdout, "[error] Event id %" PRIu64 " is unknown.\n", id);
+		return NULL;
+	}
+
+	return event;
+}
+
 static
 void process_callbacks(struct babeltrace_iter *iter,
-		struct ctf_stream *stream)
+		       struct ctf_stream *stream)
 {
 	struct bt_stream_callbacks *bt_stream_cb;
 	struct bt_callback_chain *bt_chain;
 	struct bt_callback *cb;
 	int i;
 	enum bt_cb_ret ret;
+	struct bt_ctf_data ctf_data;
+
+	ctf_data.event = extract_ctf_stream_event(stream);
+	ctf_data.stream = stream;
 
 	/* process all events callback first */
 	if (iter->main_callbacks.callback) {
@@ -456,13 +515,13 @@ void process_callbacks(struct babeltrace_iter *iter,
 			cb = &g_array_index(iter->main_callbacks.callback, struct bt_callback, i);
 			if (!cb)
 				goto end;
-			ret = cb->callback(NULL, NULL);
+			ret = cb->callback(&ctf_data, cb->private_data);
 			switch (ret) {
-				case BT_CB_OK_STOP:
-				case BT_CB_ERROR_STOP:
-					goto end;
-				default:
-					break;
+			case BT_CB_OK_STOP:
+			case BT_CB_ERROR_STOP:
+				goto end;
+			default:
+				break;
 			}
 		}
 	}
@@ -484,7 +543,7 @@ void process_callbacks(struct babeltrace_iter *iter,
 		cb = &g_array_index(bt_chain->callback, struct bt_callback, i);
 		if (!cb)
 			goto end;
-		ret = cb->callback(NULL, NULL);
+		ret = cb->callback(&ctf_data, cb->private_data);
 		switch (ret) {
 		case BT_CB_OK_STOP:
 		case BT_CB_ERROR_STOP:
@@ -552,3 +611,12 @@ end:
 	babeltrace_iter_destroy(iter);
 	return ret;
 }
+
+static
+void __attribute__((constructor)) init_babeltrace_lib(void)
+{
+	if (getenv("BABELTRACE_VERBOSE"))
+		babeltrace_verbose = 1;
+	if (getenv("BABELTRACE_DEBUG"))
+		babeltrace_debug = 1;
+}