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

diff --git a/lib/context.c b/lib/context.c
index d3232fe9..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>
@@ -30,8 +38,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 +75,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) {
@@ -79,7 +90,7 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path,
 	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;
@@ -100,14 +111,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;
-	handle->timestamp_begin = fmt->timestamp_begin(td, handle);
-	handle->timestamp_end = fmt->timestamp_end(td, handle);
-	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);
@@ -119,38 +130,64 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path,
 		(gpointer) (unsigned long) handle->id,
 		handle);
 	ret = trace_collection_add(ctx->tc, td);
-	if (ret == 0)
-		return handle->id;
+	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:
+	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);
-	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);
+	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);
@@ -163,11 +200,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);