Fix : cleanup teardown of context

Fix the error path when a trace is opened but errors occur when we index
it, and close all traces when the context is destroyed.

Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/lib/context.c b/lib/context.c
index 0f727a180a53c5834c07ff2830544b61b7c73f97..5c9f4b06401d0dc23592d23c66b8bb3751fcd3f2 100644 (file)
--- a/lib/context.c
+++ b/lib/context.c
@@ -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;
                fprintf(stderr, "[error] [Context] Creating trace handle %s .\n\n",
                                path);
                ret = -1;

-               goto end;
+               goto error;

        }
        handle->format = fmt;
        handle->td = td;
        }
        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)
                handle);
        ret = trace_collection_add(ctx->tc, td);
        if (ret != 0)

-               goto end;
+               goto error;

 
        ret = fmt->convert_index_timestamp(td);
        if (ret < 0)
 
        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);
 
        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,9 @@ 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;
        handle->cycles_timestamp_end = fmt->timestamp_end(td, handle, BT_CLOCK_CYCLES);
 
        return handle->id;

+
+error:
+       fmt->close_trace(td);

 end:
        return ret;
 }
 end:
        return ret;
 }


@@ -168,7 +171,8 @@ void bt_context_destroy(struct bt_context *ctx)
        assert(ctx);
        finalize_trace_collection(ctx->tc);
 
        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);
         * bt_trace_handle_destroy on each elements.
         */
        g_hash_table_destroy(ctx->trace_handles);

diff --git a/lib/trace-handle.c b/lib/trace-handle.c
index f981adda410ab19266c2213c6ce50cae09a0b73d..9cb654adbece20c2bf75aa9875a6cd3bba1e8560 100644 (file)
--- a/lib/trace-handle.c
+++ b/lib/trace-handle.c
@@ -41,6 +41,7 @@ struct bt_trace_handle *bt_trace_handle_create(struct bt_context *ctx)
 
 void bt_trace_handle_destroy(struct bt_trace_handle *th)
 {
 
 void bt_trace_handle_destroy(struct bt_trace_handle *th)
 {

+       th->format->close_trace(th->td);

        g_free(th);
 }
 
        g_free(th);
 }