fprintf(stderr, "[error] [Context] Creating trace handle %s .\n\n",
path);
ret = -1;
- goto error;
+ goto error_close;
}
handle->format = fmt;
handle->td = td;
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) {
+ ret = fmt->timestamp_begin(td, handle, BT_CLOCK_REAL,
+ &handle->real_timestamp_begin);
+ if (ret < 0 && ret != -ENOENT) {
+ ret = -1;
+ goto error_collection_del;
+ }
+ }
+ if (fmt->timestamp_end) {
+ ret = fmt->timestamp_end(td, handle, BT_CLOCK_REAL,
+ &handle->real_timestamp_end);
+ if (ret < 0 && ret != -ENOENT) {
+ ret = -1;
+ goto error_collection_del;
+ }
+ }
+ if (fmt->timestamp_begin) {
+ ret = fmt->timestamp_begin(td, handle, BT_CLOCK_CYCLES,
+ &handle->cycles_timestamp_begin);
+ if (ret < 0 && ret != -ENOENT) {
+ ret = -1;
+ goto error_collection_del;
+ }
+ }
+ if (fmt->timestamp_end) {
+ ret = fmt->timestamp_end(td, handle, BT_CLOCK_CYCLES,
+ &handle->cycles_timestamp_end);
+ if (ret < 0 && ret != -ENOENT) {
+ ret = -1;
+ goto error_collection_del;
+ }
+ }
+
/* Add new handle to container */
g_hash_table_insert(ctx->trace_handles,
- (gpointer) (unsigned long) handle->id,
+ GUINT_TO_POINTER(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");
* automatically.
*/
if (!g_hash_table_remove(ctx->trace_handles,
- (gpointer) (unsigned long) handle_id)) {
+ GUINT_TO_POINTER(handle_id))) {
ret = -ENOENT;
goto end;
}
{
int ret;
+ if (!handle->td->ctx)
+ return;
/* Remove from containers */
bt_trace_collection_remove(handle->td->ctx->tc, handle->td);
/* Close the trace */