Namespace the struct mmap_stream

[babeltrace.git] / lib / context.c

diff --git a/lib/context.c b/lib/context.c
index e2c1739c41ff548a21ae13a3e62f983779590e5b..00409726e0d6d38714387b8af44e4354b87da1e8 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>
@@ -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>
@@ -52,22 +60,25 @@ 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;
 }
 
 int bt_context_add_trace(struct bt_context *ctx, const char *path,
                const char *format_name,
-               void (*packet_seek)(struct stream_pos *pos, size_t index,
+               void (*packet_seek)(struct bt_stream_pos *pos, size_t index,
                        int whence),
-               struct mmap_stream_list *stream_list,
+               struct bt_mmap_stream_list *stream_list,
                FILE *metadata)
 {
-       struct trace_descriptor *td;
+       struct bt_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,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",
+                                       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;
                }
@@ -100,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;
@@ -118,13 +129,13 @@ 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 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);
@@ -132,35 +143,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);
+       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);
-
+       return 0;
 }
 
 static
 void bt_context_destroy(struct bt_context *ctx)
 {
-       finalize_trace_collection(ctx->tc);
+       assert(ctx);
+       bt_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);
@@ -173,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);