X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace-lib.c;h=ee34d283167cf89d975786297883286be0854872;hp=8f29c5a87d8c818c7dca8ffa2d6513bf45380ddd;hb=70bd0a12b09ce7f233189cf07e090fda593ebc48;hpb=312623540c466defab45503fbe0ce7ec79dcce85 diff --git a/converter/babeltrace-lib.c b/converter/babeltrace-lib.c index 8f29c5a8..ee34d283 100644 --- a/converter/babeltrace-lib.c +++ b/converter/babeltrace-lib.c @@ -3,7 +3,9 @@ * * Babeltrace Trace Converter Library * - * Copyright 2010 - Mathieu Desnoyers + * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation + * + * Author: Mathieu Desnoyers * * 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,68 +22,207 @@ #include #include #include -#include +#include #include #include #include #include +#include +#include +#include +#include +#include + +/* + * 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 */ +}; -static -int convert_stream(struct ctf_text_stream_pos *sout, - struct ctf_file_stream *sin) +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) { int ret; - /* For each event, print header, context, payload */ - /* TODO: order events by timestamps across streams */ - for (;;) { - ret = sin->pos.parent.event_cb(&sin->pos.parent, sin->stream); - if (ret == EOF) - break; - else if (ret) { - fprintf(stdout, "[error] Reading event failed.\n"); - goto error; - } - ret = sout->parent.event_cb(&sout->parent, sin->stream); - if (ret) { - fprintf(stdout, "[error] Writing event failed.\n"); - goto error; - } + ret = sin->pos.parent.event_cb(&sin->pos.parent, &sin->parent); + if (ret == EOF) + return EOF; + else if (ret) { + fprintf(stdout, "[error] Reading event failed.\n"); + return ret; } - return 0; +} -error: - return ret; +/* + * returns true if a < b, false otherwise. + */ +int stream_compare(void *a, void *b) +{ + struct ctf_file_stream *s_a = a, *s_b = b; + + if (s_a->parent.timestamp < s_b->parent.timestamp) + return 1; + else + return 0; } -int convert_trace(struct trace_descriptor *td_write, - struct trace_descriptor *td_read) +struct babeltrace_iter *babeltrace_iter_create(struct trace_collection *tc) { - 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; + 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); - /* 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; + 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: + 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); +} + +int babeltrace_iter_next(struct babeltrace_iter *iter) +{ + struct ctf_file_stream *file_stream, *removed; + int ret; + + file_stream = heap_maximum(iter->stream_heap); + if (!file_stream) { + /* end of file for all streams */ + ret = 0; + goto end; + } + + 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); + +end: + return ret; +} + +int babeltrace_iter_read_event(struct babeltrace_iter *iter, + struct ctf_stream **stream, + struct ctf_stream_event **event) +{ + 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; +} + +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; + } +end: + babeltrace_iter_destroy(iter); return ret; }