X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Fcontext.c;h=87901b3c61027aadea02e0ddf0f9aa042b4aaac1;hp=d06742231604b6b4ea55f32a5e2deeea32e8fd71;hb=d0150567cbd3c467ca94968c16d8f7dad05e935b;hpb=2552c374b9c87056187ff9af572f9fba7ee7839d diff --git a/lib/context.c b/lib/context.c index d0674223..87901b3c 100644 --- a/lib/context.c +++ b/lib/context.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -44,6 +45,9 @@ #include +static +void remove_trace_handle(struct bt_trace_handle *handle); + struct bt_context *bt_context_create(void) { struct bt_context *ctx; @@ -56,7 +60,7 @@ struct bt_context *bt_context_create(void) /* Instanciate the trace handle container */ ctx->trace_handles = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, - (GDestroyNotify) bt_trace_handle_destroy); + (GDestroyNotify) remove_trace_handle); ctx->current_iterator = NULL; ctx->tc = g_new0(struct trace_collection, 1); @@ -67,13 +71,13 @@ struct bt_context *bt_context_create(void) int bt_context_add_trace(struct bt_context *ctx, const char *path, const char *format_name, - void (*packet_seek)(struct stream_pos *pos, size_t index, + void (*packet_seek)(struct bt_stream_pos *pos, size_t index, int whence), - struct mmap_stream_list *stream_list, + struct bt_mmap_stream_list *stream_list, FILE *metadata) { - struct trace_descriptor *td; - struct format *fmt; + struct bt_trace_descriptor *td; + struct bt_format *fmt; struct bt_trace_handle *handle; int ret, closeret; @@ -90,7 +94,7 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path, if (path) { td = fmt->open_trace(path, O_RDONLY, packet_seek, NULL); if (!td) { - fprintf(stderr, "[warning] [Context] Cannot open_trace of format %s at path %s.\n\n", + fprintf(stderr, "[warning] [Context] Cannot open_trace of format %s at path %s.\n", format_name, path); ret = -1; goto end; @@ -107,11 +111,11 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path, /* Create an handle for the trace */ handle = bt_trace_handle_create(ctx); - if (handle < 0) { + if (!handle) { fprintf(stderr, "[error] [Context] Creating trace handle %s .\n\n", path); ret = -1; - goto error; + goto error_close; } handle->format = fmt; handle->td = td; @@ -120,31 +124,47 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path, handle->path[PATH_MAX - 1] = '\0'; } + ret = bt_trace_collection_add(ctx->tc, td); + if (ret != 0) + goto error_destroy_handle; + if (fmt->set_handle) fmt->set_handle(td, handle); if (fmt->set_context) fmt->set_context(td, ctx); + if (fmt->convert_index_timestamp) { + ret = fmt->convert_index_timestamp(td); + if (ret < 0) + goto error_collection_del; + } + + if (fmt->timestamp_begin) + handle->real_timestamp_begin = fmt->timestamp_begin(td, + handle, BT_CLOCK_REAL); + if (fmt->timestamp_end) + handle->real_timestamp_end = fmt->timestamp_end(td, handle, + BT_CLOCK_REAL); + if (fmt->timestamp_begin) + handle->cycles_timestamp_begin = fmt->timestamp_begin(td, + handle, BT_CLOCK_CYCLES); + if (fmt->timestamp_end) + handle->cycles_timestamp_end = fmt->timestamp_end(td, handle, + BT_CLOCK_CYCLES); + /* Add new handle to container */ g_hash_table_insert(ctx->trace_handles, (gpointer) (unsigned long) handle->id, handle); - ret = bt_trace_collection_add(ctx->tc, td); - if (ret != 0) - goto error; - - ret = fmt->convert_index_timestamp(td); - if (ret < 0) - goto error; - - handle->real_timestamp_begin = fmt->timestamp_begin(td, handle, BT_CLOCK_REAL); - handle->real_timestamp_end = fmt->timestamp_end(td, handle, BT_CLOCK_REAL); - handle->cycles_timestamp_begin = fmt->timestamp_begin(td, handle, BT_CLOCK_CYCLES); - handle->cycles_timestamp_end = fmt->timestamp_end(td, handle, BT_CLOCK_CYCLES); return handle->id; -error: +error_collection_del: + /* Remove from containers */ + bt_trace_collection_remove(handle->td->ctx->tc, handle->td); +error_destroy_handle: + bt_trace_handle_destroy(handle); +error_close: closeret = fmt->close_trace(td); if (closeret) { fprintf(stderr, "Error in close_trace callback\n"); @@ -155,43 +175,39 @@ end: int bt_context_remove_trace(struct bt_context *ctx, int handle_id) { - struct bt_trace_handle *handle; - int ret; + int ret = 0; - if (!ctx) - return -EINVAL; - - handle = g_hash_table_lookup(ctx->trace_handles, - (gpointer) (unsigned long) handle_id); - if (!handle) - return -ENOENT; + if (!ctx) { + ret = -EINVAL; + goto end; + } - /* Remove from containers */ - bt_trace_collection_remove(ctx->tc, handle->td); - /* Close the trace */ - ret = handle->format->close_trace(handle->td); - if (ret) { - fprintf(stderr, "Error in close_trace callback\n"); - return ret; + /* + * Remove the handle. remove_trace_handle will be called + * automatically. + */ + if (!g_hash_table_remove(ctx->trace_handles, + (gpointer) (unsigned long) handle_id)) { + ret = -ENOENT; + goto end; } - /* Remove and free the handle */ - g_hash_table_remove(ctx->trace_handles, - (gpointer) (unsigned long) handle_id); - return 0; +end: + return ret; } static void bt_context_destroy(struct bt_context *ctx) { assert(ctx); - bt_finalize_trace_collection(ctx->tc); /* * Remove all traces. The g_hash_table_destroy will call - * bt_trace_handle_destroy on each elements. + * remove_trace_handle on each element. */ g_hash_table_destroy(ctx->trace_handles); + bt_finalize_trace_collection(ctx->tc); + /* ctx->tc should always be valid */ assert(ctx->tc != NULL); g_free(ctx->tc); @@ -211,3 +227,21 @@ void bt_context_put(struct bt_context *ctx) if (ctx->refcount == 0) bt_context_destroy(ctx); } + +static +void remove_trace_handle(struct bt_trace_handle *handle) +{ + int ret; + + if (!handle->td->ctx) + return; + /* Remove from containers */ + bt_trace_collection_remove(handle->td->ctx->tc, handle->td); + /* Close the trace */ + ret = handle->format->close_trace(handle->td); + if (ret) { + fprintf(stderr, "Error in close_trace callback\n"); + } + + bt_trace_handle_destroy(handle); +}