X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace-lib.c;h=ee34d283167cf89d975786297883286be0854872;hp=c96f38904fba89dd2dee7c8b0876d87ec9ec8d82;hb=70bd0a12b09ce7f233189cf07e090fda593ebc48;hpb=b1a2f5806630289aa0b85edbb7f7c581cfa26178

diff --git a/converter/babeltrace-lib.c b/converter/babeltrace-lib.c
index c96f3890..ee34d283 100644
--- a/converter/babeltrace-lib.c
+++ b/converter/babeltrace-lib.c
@@ -3,7 +3,9 @@
  *
  * Babeltrace Trace Converter Library
  *
- * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,150 +22,207 @@
 #include <errno.h>
 #include <stdio.h>
 #include <inttypes.h>
-#include <babeltrace/babeltrace.h>
+#include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/format.h>
 #include <babeltrace/ctf/types.h>
 #include <babeltrace/ctf/metadata.h>
 #include <babeltrace/ctf-text/types.h>
+#include <babeltrace/prio_heap.h>
+#include <babeltrace/babeltrace.h>
+#include <babeltrace/types.h>
+#include <babeltrace/ctf/types.h>
+#include <babeltrace/ctf-ir/metadata.h>
 
-static
-int convert_event(struct ctf_text_stream_pos *sout,
-		  struct ctf_file_stream *sin)
+/*
+ * struct babeltrace_iter: data structure representing an iterator on a trace
+ * collection.
+ */
+struct babeltrace_iter {
+	struct ptr_heap *stream_heap;
+	struct trace_collection *tc;
+};
+
+struct babeltrace_iter_pos {
+	GPtrArray *pos; /* struct babeltrace_iter_stream_pos */
+};
+
+struct babeltrace_iter_stream_pos {
+	struct stream_pos parent;
+	ssize_t offset;
+	size_t cur_index;
+};
+
+static int stream_read_event(struct ctf_file_stream *sin)
 {
-	struct ctf_stream *stream_class = sin->stream;
-	struct ctf_event *event_class;
-	uint64_t id = 0;
-	int len_index;
 	int ret;
 
-	if (sin->pos.offset == EOF)
+	ret = sin->pos.parent.event_cb(&sin->pos.parent, &sin->parent);
+	if (ret == EOF)
 		return EOF;
-
-	/* Hide event payload struct brackets */
-	sout->depth = -1;
-
-	/* Read and print event header */
-	if (stream_class->event_header) {
-		ret = generic_rw(&sin->pos.parent, &stream_class->event_header->p);
-		if (ret)
-			goto error;
-		/* lookup event id */
-		len_index = struct_declaration_lookup_field_index(stream_class->event_header_decl,
-				g_quark_from_static_string("id"));
-		if (len_index >= 0) {
-			struct definition_integer *defint;
-			struct definition *field;
-
-			field = struct_definition_get_field_from_index(stream_class->event_header, len_index);
-			assert(field->declaration->id == CTF_TYPE_INTEGER);
-			defint = container_of(field, struct definition_integer, p);
-			assert(defint->declaration->signedness == FALSE);
-			id = defint->value._unsigned;	/* set id */
-		}
-
-		ret = generic_rw(&sout->parent, &stream_class->event_header->p);
-		if (ret)
-			goto error;
-	}
-
-	/* Read and print stream-declared event context */
-	if (stream_class->event_context) {
-		ret = generic_rw(&sin->pos.parent, &stream_class->event_context->p);
-		if (ret)
-			goto error;
-		ret = generic_rw(&sout->parent, &stream_class->event_context->p);
-		if (ret)
-			goto error;
+	else if (ret) {
+		fprintf(stdout, "[error] Reading event failed.\n");
+		return ret;
 	}
+	return 0;
+}
 
-	if (id >= stream_class->events_by_id->len) {
-		fprintf(stdout, "[error] Event id %" PRIu64 " is outside range.\n", id);
-		return -EINVAL;
-	}
-	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 -EINVAL;
-	}
+/*
+ * returns true if a < b, false otherwise.
+ */
+int stream_compare(void *a, void *b)
+{
+	struct ctf_file_stream *s_a = a, *s_b = b;
 
-	/* Read and print event-declared event context */
-	if (event_class->context) {
-		ret = generic_rw(&sin->pos.parent, &event_class->context->p);
-		if (ret)
-			goto error;
-		ret = generic_rw(&sout->parent, &event_class->context->p);
-		if (ret)
-			goto error;
-	}
+	if (s_a->parent.timestamp < s_b->parent.timestamp)
+		return 1;
+	else
+		return 0;
+}
 
-	/* Read and print event payload */
-	if (event_class->fields) {
-		ret = generic_rw(&sin->pos.parent, &event_class->fields->p);
-		if (ret)
-			goto error;
-		ret = generic_rw(&sout->parent, &event_class->fields->p);
-		if (ret)
-			goto error;
+struct babeltrace_iter *babeltrace_iter_create(struct trace_collection *tc)
+{
+	int i, stream_id;
+	int ret = 0;
+	struct babeltrace_iter *iter;
+
+	iter = malloc(sizeof(struct babeltrace_iter));
+	if (!iter)
+		goto error_malloc;
+	iter->stream_heap = g_new(struct ptr_heap, 1);
+	iter->tc = tc;
+
+	ret = heap_init(iter->stream_heap, 0, stream_compare);
+	if (ret < 0)
+		goto error_heap_init;
+
+	for (i = 0; i < tc->array->len; i++) {
+		struct ctf_trace *tin;
+		struct trace_descriptor *td_read;
+
+		td_read = g_ptr_array_index(tc->array, i);
+		tin = container_of(td_read, struct ctf_trace, parent);
+
+		/* Populate heap with each stream */
+		for (stream_id = 0; stream_id < tin->streams->len;
+				stream_id++) {
+			struct ctf_stream_class *stream;
+			int filenr;
+
+			stream = g_ptr_array_index(tin->streams, stream_id);
+			if (!stream)
+				continue;
+			for (filenr = 0; filenr < stream->streams->len;
+					filenr++) {
+				struct ctf_file_stream *file_stream;
+
+				file_stream = g_ptr_array_index(stream->streams,
+						filenr);
+
+				ret = stream_read_event(file_stream);
+				if (ret == EOF) {
+					ret = 0;
+					continue;
+				} else if (ret) {
+					goto error;
+				}
+				/* Add to heap */
+				ret = heap_insert(iter->stream_heap, file_stream);
+				if (ret)
+					goto error;
+			}
+		}
 	}
 
-	return 0;
+	return iter;
 
 error:
-	fprintf(stdout, "[error] Unexpected end of stream. Either the trace data stream is corrupted or metadata description does not match data layout.\n");
-	return ret;
+	heap_free(iter->stream_heap);
+error_heap_init:
+	g_free(iter->stream_heap);
+	free(iter);
+error_malloc:
+	return NULL;
+}
+
+void babeltrace_iter_destroy(struct babeltrace_iter *iter)
+{
+	heap_free(iter->stream_heap);
+	g_free(iter->stream_heap);
+	free(iter);
 }
 
-static
-int convert_stream(struct ctf_text_stream_pos *sout,
-		   struct ctf_file_stream *sin)
+int babeltrace_iter_next(struct babeltrace_iter *iter)
 {
+	struct ctf_file_stream *file_stream, *removed;
 	int ret;
 
-	/* For each event, print header, context, payload */
-	/* TODO: order events by timestamps across streams */
-	for (;;) {
-		ret = convert_event(sout, sin);
-		if (ret == EOF)
-			break;
-		else if (ret) {
-			fprintf(stdout, "[error] Printing event failed.\n");
-			goto error;
-		}
+	file_stream = heap_maximum(iter->stream_heap);
+	if (!file_stream) {
+		/* end of file for all streams */
+		ret = 0;
+		goto end;
 	}
 
-	return 0;
+	ret = stream_read_event(file_stream);
+	if (ret == EOF) {
+		removed = heap_remove(iter->stream_heap);
+		assert(removed == file_stream);
+		ret = 0;
+		goto end;
+	} else if (ret) {
+		goto end;
+	}
+	/* Reinsert the file stream into the heap, and rebalance. */
+	removed = heap_replace_max(iter->stream_heap, file_stream);
+	assert(removed == file_stream);
 
-error:
+end:
 	return ret;
 }
 
-int convert_trace(struct trace_descriptor *td_write,
-		  struct trace_descriptor *td_read)
+int babeltrace_iter_read_event(struct babeltrace_iter *iter,
+		struct ctf_stream **stream,
+		struct ctf_stream_event **event)
 {
-	struct ctf_trace *tin = container_of(td_read, struct ctf_trace, parent);
-	struct ctf_text_stream_pos *sout =
-		container_of(td_write, struct ctf_text_stream_pos, trace_descriptor);
-	int stream_id, filenr;
-	int ret;
+	struct ctf_file_stream *file_stream;
+	int ret = 0;
+
+	file_stream = heap_maximum(iter->stream_heap);
+	if (!file_stream) {
+		/* end of file for all streams */
+		ret = EOF;
+		goto end;
+	}
+	*stream = &file_stream->parent;
+	*event = g_ptr_array_index((*stream)->events_by_id, (*stream)->event_id);
+end:
+	return ret;
+}
 
-	/* For each stream (TODO: order events by timestamp) */
-	for (stream_id = 0; stream_id < tin->streams->len; stream_id++) {
-		struct ctf_stream *stream = g_ptr_array_index(tin->streams, stream_id);
-
-		if (!stream)
-			continue;
-		for (filenr = 0; filenr < stream->files->len; filenr++) {
-			struct ctf_file_stream *file_stream = g_ptr_array_index(stream->files, filenr);
-			ret = convert_stream(sout, file_stream);
-			if (ret) {
-				fprintf(stdout, "[error] Printing stream %d failed.\n", stream_id);
-				goto error;
-			}
+int convert_trace(struct trace_descriptor *td_write,
+		  struct trace_collection *trace_collection_read)
+{
+	struct babeltrace_iter *iter;
+	struct ctf_stream *stream;
+	struct ctf_stream_event *event;
+	struct ctf_text_stream_pos *sout;
+	int ret = 0;
+
+	sout = container_of(td_write, struct ctf_text_stream_pos,
+			trace_descriptor);
+
+	iter = babeltrace_iter_create(trace_collection_read);
+	while (babeltrace_iter_read_event(iter, &stream, &event) == 0) {
+		ret = sout->parent.event_cb(&sout->parent, stream);
+		if (ret) {
+			fprintf(stdout, "[error] Writing event failed.\n");
+			goto end;
 		}
+		ret = babeltrace_iter_next(iter);
+		if (ret < 0)
+			goto end;
 	}
-
-	return 0;
-
-error:
+end:
+	babeltrace_iter_destroy(iter);
 	return ret;
 }