X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Fcontext.c;h=bedcc42042e0c95353e930aa0ede89ba2297c45d;hp=f4c234aa6f955960edccb0f0550928c254b22d74;hb=188e72bf705ebe0276e7966a9bf46b74e583bcfc;hpb=06789ffdba97a7be3cceae51e97e82cc5a6c318a

diff --git a/lib/context.c b/lib/context.c
index f4c234aa..bedcc420 100644
--- a/lib/context.c
+++ b/lib/context.c
@@ -26,14 +26,14 @@
 #include <babeltrace/trace-handle-internal.h>
 #include <babeltrace/trace-collection.h>
 #include <babeltrace/format.h>
+#include <babeltrace/babeltrace-internal.h>
 #include <stdlib.h>
+#include <string.h>
+#include <assert.h>
 
 #include <fts.h>
 #include <fcntl.h> /* For O_RDONLY */
 
-/* TODO ybrosseau: should be hidden in the CTF format */
-#include <babeltrace/ctf/types.h> /* for ctf_packet_seek */
-
 #include <glib.h>
 
 struct bt_context *bt_context_create(void)
@@ -50,6 +50,7 @@ struct bt_context *bt_context_create(void)
 				g_direct_equal, NULL,
 				(GDestroyNotify) bt_trace_handle_destroy);
 
+	ctx->current_iterator = NULL;
 	ctx->tc = g_new0(struct trace_collection, 1);
 	init_trace_collection(ctx->tc);
 
@@ -57,7 +58,11 @@ struct bt_context *bt_context_create(void)
 }
 
 int bt_context_add_trace(struct bt_context *ctx, const char *path,
-		const char *format_name)
+		const char *format_name,
+		void (*packet_seek)(struct stream_pos *pos, size_t index,
+			int whence),
+		struct mmap_stream_list *stream_list,
+		FILE *metadata)
 {
 	struct trace_descriptor *td;
 	struct format *fmt;
@@ -71,13 +76,22 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path,
 		ret = -1;
 		goto end;
 	}
-	td = fmt->open_trace(path, O_RDONLY,
-			     ctf_packet_seek, NULL);
-	if (!td) {
-		fprintf(stderr, "[error] [Context] Cannot open_trace of the format %s .\n\n",
-				path);
-		ret = -1;
-		goto end;
+	if (path) {
+		td = fmt->open_trace(path, O_RDONLY, packet_seek, NULL);
+		if (!td) {
+			fprintf(stderr, "[warning] [Context] Cannot open_trace of the format %s .\n\n",
+					path);
+			ret = -1;
+			goto end;
+		}
+	} else {
+		td = fmt->open_mmap_trace(stream_list, packet_seek, metadata);
+		if (!td) {
+			fprintf(stderr, "[error] [Context] Cannot open_trace of the format %s .\n\n",
+					path);
+			ret = -1;
+			goto end;
+		}
 	}
 
 	/* Create an handle for the trace */
@@ -90,9 +104,16 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path,
 	}
 	handle->format = fmt;
 	handle->td = td;
+	handle->timestamp_begin = fmt->timestamp_begin(td, handle);
+	handle->timestamp_end = fmt->timestamp_end(td, handle);
 	strncpy(handle->path, path, PATH_MAX);
 	handle->path[PATH_MAX - 1] = '\0';
 
+	if (fmt->set_handle)
+		fmt->set_handle(td, handle);
+	if (fmt->set_context)
+		fmt->set_context(td, ctx);
+
 	/* Add new handle to container */
 	g_hash_table_insert(ctx->trace_handles,
 		(gpointer) (unsigned long) handle->id,
@@ -114,14 +135,13 @@ void bt_context_remove_trace(struct bt_context *ctx, int handle_id)
 
 	/* Remove from containers */
 	trace_collection_remove(ctx->tc, handle->td);
-	g_hash_table_remove(ctx->trace_handles,
-		(gpointer) (unsigned long) handle_id);
-
 	/* Close the trace */
 	handle->format->close_trace(handle->td);
 
-	/* Destory the handle */
-	bt_trace_handle_destroy(handle);
+	/* Remove and free the handle */
+	g_hash_table_remove(ctx->trace_handles,
+			(gpointer) (unsigned long) handle_id);
+
 }
 
 static