X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Fcontext.c;h=a044d1c49f833ff104c51065f8f0e79220d4bd7f;hp=0f727a180a53c5834c07ff2830544b61b7c73f97;hb=refs%2Ftags%2Fv1.0.0-rc6;hpb=91f361c1757256c11988ab16376419a72592e1a9

diff --git a/lib/context.c b/lib/context.c
index 0f727a18..a044d1c4 100644
--- a/lib/context.c
+++ b/lib/context.c
@@ -67,7 +67,7 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path,
 	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;
@@ -103,7 +103,7 @@ 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;
@@ -123,11 +123,11 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path,
 		handle);
 	ret = trace_collection_add(ctx->tc, td);
 	if (ret != 0)
-		goto end;
+		goto error;
 
 	ret = fmt->convert_index_timestamp(td);
 	if (ret < 0)
-		goto end;
+		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);
@@ -135,6 +135,12 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path,
 	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;
 }
@@ -142,6 +148,7 @@ end:
 int bt_context_remove_trace(struct bt_context *ctx, int handle_id)
 {
 	struct bt_trace_handle *handle;
+	int ret;
 
 	if (!ctx)
 		return -EINVAL;
@@ -154,8 +161,11 @@ int bt_context_remove_trace(struct bt_context *ctx, int handle_id)
 	/* Remove from containers */
 	trace_collection_remove(ctx->tc, handle->td);
 	/* Close the trace */
-	handle->format->close_trace(handle->td);
-
+	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);
@@ -168,7 +178,8 @@ 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);