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

diff --git a/lib/context.c b/lib/context.c
index 373944c2..a044d1c4 100644
--- a/lib/context.c
+++ b/lib/context.c
@@ -30,8 +30,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
+#include <errno.h>
 
-#include <fts.h>
 #include <fcntl.h> /* For O_RDONLY */
 
 #include <glib.h>
@@ -67,7 +67,10 @@ 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;
 
 	fmt = bt_lookup_format(g_quark_from_string(format_name));
 	if (!fmt) {
@@ -100,12 +103,14 @@ 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);
@@ -118,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);
@@ -130,35 +135,51 @@ 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;
 }
 
-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);
 	/* 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);
-
+	return 0;
 }
 
 static
 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);
@@ -171,11 +192,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);