X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Fcontext.c;h=a044d1c49f833ff104c51065f8f0e79220d4bd7f;hp=f2f76be31a1cdbe0dc40da3284948ebc21812855;hb=refs%2Ftags%2Fv1.0.0-rc6;hpb=e669e45e7fdff6b855907cde40524ebf4cc8a3bc diff --git a/lib/context.c b/lib/context.c index f2f76be3..a044d1c4 100644 --- a/lib/context.c +++ b/lib/context.c @@ -26,14 +26,14 @@ #include #include #include +#include #include +#include +#include +#include -#include #include /* For O_RDONLY */ -/* TODO ybrosseau: should be hidden in the CTF format */ -#include /* for ctf_move_pos_slow */ - #include 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,148 +58,128 @@ struct bt_context *bt_context_create(void) } int bt_context_add_trace(struct bt_context *ctx, const char *path, - const char *format_str) + 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; struct bt_trace_handle *handle; + int ret, closeret; - fmt = bt_lookup_format(g_quark_from_string(format_str)); - td = fmt->open_trace(path, O_RDONLY, - ctf_move_pos_slow, NULL); - if (!td) { - fprintf(stdout, "[error] [Context] Cannot open_trace of the format %s .\n\n", - path); - return -1; + if (!ctx || !format_name || (!path && !stream_list)) + return -EINVAL; + + fmt = bt_lookup_format(g_quark_from_string(format_name)); + if (!fmt) { + fprintf(stderr, "[error] [Context] Format \"%s\" unknown.\n\n", + format_name); + 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 */ handle = bt_trace_handle_create(ctx); if (handle < 0) { - fprintf(stdout, "[error] [Context] Creating trace handle %s .\n\n", + fprintf(stderr, "[error] [Context] Creating trace handle %s .\n\n", path); - return -1; + ret = -1; + goto error; } handle->format = fmt; handle->td = td; - strncpy(handle->path, path, PATH_MAX); - handle->path[PATH_MAX - 1] = '\0'; + if (path) { + 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, handle); - trace_collection_add(ctx->tc, td); - return 0; -} + ret = trace_collection_add(ctx->tc, td); + if (ret != 0) + goto error; -/* - * Unable to open toplevel: failure. - * Unable to open some subdirectory or file: warn and continue; - */ -int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path, - const char *format_str) -{ - FTS *tree; - FTSENT *node; - GArray *trace_ids; - char lpath[PATH_MAX]; - char * const paths[2] = { lpath, NULL }; - int ret; - - /* - * Need to copy path, because fts_open can change it. - * It is the pointer array, not the strings, that are constant. - */ - strncpy(lpath, path, PATH_MAX); - lpath[PATH_MAX - 1] = '\0'; + ret = fmt->convert_index_timestamp(td); + if (ret < 0) + goto error; - tree = fts_open(paths, FTS_NOCHDIR | FTS_LOGICAL, 0); - if (tree == NULL) { - fprintf(stdout, "[error] Cannot traverse \"%s\" for reading.\n\n", - path); - return -EINVAL; - } + 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); - trace_ids = g_array_new(FALSE, TRUE, sizeof(int)); - - while ((node = fts_read(tree))) { - int dirfd, metafd; - - if (!(node->fts_info & FTS_D)) - continue; - - dirfd = open(node->fts_accpath, 0); - if (dirfd < 0) { - fprintf(stdout, "[warning] unable to open trace " - "directory file descriptor.\n"); - continue; - } - metafd = openat(dirfd, "metadata", O_RDONLY); - if (metafd < 0) { - ret = close(dirfd); - if (ret < 0) { - perror("close"); - goto error; - } - } else { - int trace_id; - - ret = close(metafd); - if (ret < 0) { - perror("close"); - goto error; - } - ret = close(dirfd); - if (ret < 0) { - perror("close"); - goto error; - } - - trace_id = bt_context_add_trace(ctx, - node->fts_accpath, format_str); - if (trace_id < 0) { - fprintf(stdout, "[warning] CTX opening trace \"%s\"from %s " - "for reading.\n\n", node->fts_accpath, path); - continue; - } - g_array_append_val(trace_ids, trace_id); - } - } - - g_array_free(trace_ids, TRUE); - return 0; + return handle->id; error: + closeret = fmt->close_trace(td); + if (closeret) { + fprintf(stderr, "Error in close_trace callback\n"); + } +end: return ret; } -void bt_context_remove_trace(struct bt_context *ctx, int handle_id) +int bt_context_remove_trace(struct bt_context *ctx, int handle_id) { struct bt_trace_handle *handle; + int ret; + + if (!ctx) + return -EINVAL; handle = g_hash_table_lookup(ctx->trace_handles, (gpointer) (unsigned long) handle_id); - assert(handle != NULL); + if (!handle) + return -ENOENT; /* 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); + ret = handle->format->close_trace(handle->td); + if (ret) { + fprintf(stderr, "Error in close_trace callback\n"); + return ret; + } + /* Remove and free the handle */ + g_hash_table_remove(ctx->trace_handles, + (gpointer) (unsigned long) handle_id); + return 0; } static void bt_context_destroy(struct bt_context *ctx) { + assert(ctx); finalize_trace_collection(ctx->tc); - /* Remote all traces. The g_hash_table_destroy will call + /* + * Remove all traces. The g_hash_table_destroy will call * bt_trace_handle_destroy on each elements. */ g_hash_table_destroy(ctx->trace_handles); @@ -211,11 +192,13 @@ void bt_context_destroy(struct bt_context *ctx) void bt_context_get(struct bt_context *ctx) { + assert(ctx); ctx->refcount++; } void bt_context_put(struct bt_context *ctx) { + assert(ctx); ctx->refcount--; if (ctx->refcount == 0) bt_context_destroy(ctx);