X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Fcontext.c;h=9c1159860ebc7a0d7af512f0ede5cc5250cdb154;hp=dca4cb2b4fc4605735f795872570ae34456c82b7;hb=c462e188f3e7819c7bc74f671038cdbf36e8c3c0;hpb=7f89ddce05f0a5c985d6333fbe70a992da4bd244

diff --git a/lib/context.c b/lib/context.c
index dca4cb2b..9c115986 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 <babeltrace/babeltrace.h>
@@ -32,7 +40,6 @@
 #include <assert.h>
 #include <errno.h>
 
-#include <fts.h>
 #include <fcntl.h> /* For O_RDONLY */
 
 #include <glib.h>
@@ -68,7 +75,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;
@@ -104,7 +111,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;
@@ -124,11 +131,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);
@@ -136,6 +143,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;
 }
@@ -143,6 +156,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;
@@ -155,8 +169,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);
@@ -169,7 +186,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);