X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Fcontext.c;h=d06742231604b6b4ea55f32a5e2deeea32e8fd71;hp=5021d7add1c56ab92386e4f93cdd43c520509086;hb=2552c374b9c87056187ff9af572f9fba7ee7839d;hpb=613f532b047a23c6916e2c08707b09296edbfcb2 diff --git a/lib/context.c b/lib/context.c index 5021d7ad..d0674223 100644 --- a/lib/context.c +++ b/lib/context.c @@ -17,6 +17,14 @@ * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ #include @@ -30,8 +38,8 @@ #include #include #include +#include -#include #include /* For O_RDONLY */ #include @@ -50,21 +58,27 @@ 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); + bt_init_trace_collection(ctx->tc); return ctx; } 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 offset, int whence)) + 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; + int ret, closeret; + + if (!ctx || !format_name || (!path && !stream_list)) + return -EINVAL; fmt = bt_lookup_format(g_quark_from_string(format_name)); if (!fmt) { @@ -73,12 +87,22 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path, ret = -1; goto end; } - td = fmt->open_trace(path, O_RDONLY, 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 format %s at path %s.\n\n", + format_name, path); + ret = -1; + goto end; + } + } else { + td = fmt->open_mmap_trace(stream_list, packet_seek, metadata); + if (!td) { + fprintf(stderr, "[error] [Context] Cannot open_mmap_trace of format %s.\n\n", + format_name); + ret = -1; + goto end; + } } /* Create an handle for the trace */ @@ -87,50 +111,83 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path, fprintf(stderr, "[error] [Context] Creating trace handle %s .\n\n", path); ret = -1; - goto end; + 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); - ret = trace_collection_add(ctx->tc, td); - if (ret == 0) - return handle->id; + 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: + 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); - + bt_trace_collection_remove(ctx->tc, handle->td); /* 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) { - finalize_trace_collection(ctx->tc); + assert(ctx); + bt_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); @@ -143,11 +200,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);