namespace the collection functions

[babeltrace.git] / lib / context.c

diff --git a/lib/context.c b/lib/context.c
index 5c9f4b06401d0dc23592d23c66b8bb3751fcd3f2..d06742231604b6b4ea55f32a5e2deeea32e8fd71 100644 (file)
--- 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>
@@ -52,7 +60,7 @@ struct bt_context *bt_context_create(void)
 
        ctx->current_iterator = NULL;
        ctx->tc = g_new0(struct trace_collection, 1);
-       init_trace_collection(ctx->tc);
+       bt_init_trace_collection(ctx->tc);
 
        return ctx;
 }
@@ -67,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;
@@ -82,16 +90,16 @@ 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, "[warning] [Context] Cannot open_trace of the format %s .\n\n",
-                                       path);
+                       fprintf(stderr, "[warning] [Context] Cannot open_trace of format %s at path %s.\n\n",
+                                       format_name, path);
                        ret = -1;
                        goto end;
                }
        } else {
                td = fmt->open_mmap_trace(stream_list, packet_seek, metadata);
                if (!td) {
-                       fprintf(stderr, "[error] [Context] Cannot open_trace of the format %s .\n\n",
-                                       path);
+                       fprintf(stderr, "[error] [Context] Cannot open_mmap_trace of format %s.\n\n",
+                                       format_name);
                        ret = -1;
                        goto end;
                }
@@ -121,7 +129,7 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path,
        g_hash_table_insert(ctx->trace_handles,
                (gpointer) (unsigned long) handle->id,
                handle);
-       ret = trace_collection_add(ctx->tc, td);
+       ret = bt_trace_collection_add(ctx->tc, td);
        if (ret != 0)
                goto error;
 
@@ -137,7 +145,10 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path,
        return handle->id;
 
 error:
-       fmt->close_trace(td);
+       closeret = fmt->close_trace(td);
+       if (closeret) {
+               fprintf(stderr, "Error in close_trace callback\n");
+       }
 end:
        return ret;
 }
@@ -145,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,10 +167,13 @@ int bt_context_remove_trace(struct bt_context *ctx, int handle_id)
                return -ENOENT;
 
        /* Remove from containers */
-       trace_collection_remove(ctx->tc, handle->td);
+       bt_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 +184,7 @@ static
 void bt_context_destroy(struct bt_context *ctx)
 {
        assert(ctx);
-       finalize_trace_collection(ctx->tc);
+       bt_finalize_trace_collection(ctx->tc);
 
        /*
         * Remove all traces. The g_hash_table_destroy will call