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);
if (path) {
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",
+ fprintf(stderr, "[warning] [Context] Cannot open_trace of the format %s .\n\n",
path);
ret = -1;
goto end;
}
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;
+ if (ret != 0)
+ goto end;
+
+ ret = fmt->convert_index_timestamp(td);
+ if (ret < 0)
+ goto end;
+
+ 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;
end:
return ret;
}
/* 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);
+ /* Remove and free the handle */
+ g_hash_table_remove(ctx->trace_handles,
+ (gpointer) (unsigned long) handle_id);
+
}
static