#include <babeltrace/trace-handle-internal.h>
#include <babeltrace/trace-collection.h>
#include <babeltrace/format.h>
+#include <babeltrace/babeltrace-internal.h>
#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
#include <fts.h>
#include <fcntl.h> /* For O_RDONLY */
-/* TODO ybrosseau: should be hidden in the CTF format */
-#include <babeltrace/ctf/types.h> /* for ctf_move_pos_slow */
-
#include <glib.h>
struct bt_context *bt_context_create(void)
g_direct_equal, NULL,
(GDestroyNotify) bt_trace_handle_destroy);
+ ctx->current_iterator = NULL;
ctx->tc = g_new0(struct trace_collection, 1);
init_trace_collection(ctx->tc);
}
int bt_context_add_trace(struct bt_context *ctx, const char *path,
- const char *format_str)
+ const char *format_name,
+ void (*packet_seek)(struct stream_pos *pos, size_t index,
+ int whence),
+ struct mmap_stream_list *stream_list,
+ FILE *metadata)
{
struct trace_descriptor *td;
struct format *fmt;
struct bt_trace_handle *handle;
+ int ret;
- fmt = bt_lookup_format(g_quark_from_string(format_str));
- td = fmt->open_trace(path, O_RDONLY,
- ctf_move_pos_slow, NULL);
- if (!td) {
- fprintf(stdout, "[error] [Context] Cannot Open_trace of the format %s .\n\n",
- path);
- return 0;
+ fmt = bt_lookup_format(g_quark_from_string(format_name));
+ if (!fmt) {
+ fprintf(stderr, "[error] [Context] Format \"%s\" unknown.\n\n",
+ format_name);
+ ret = -1;
+ goto end;
+ }
+ 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);
+ 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);
+ ret = -1;
+ goto end;
+ }
}
/* Create an handle for the trace */
handle = bt_trace_handle_create(ctx);
if (handle < 0) {
- fprintf(stdout, "[error] [Context] Creating trace handle %s .\n\n",
+ fprintf(stderr, "[error] [Context] Creating trace handle %s .\n\n",
path);
- return 0;
+ ret = -1;
+ goto end;
}
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 (fmt->set_handle)
+ fmt->set_handle(td, handle);
+ if (fmt->set_context)
+ fmt->set_context(td, ctx);
+
/* Add new handle to container */
g_hash_table_insert(ctx->trace_handles,
(gpointer) (unsigned long) handle->id,
handle);
- trace_collection_add(ctx->tc, td);
- return handle->id;
-}
-
-/*
- * Unable to open toplevel: failure.
- * Unable to open some subdirectory or file: warn and continue;
- */
-int bt_context_add_traces(struct bt_context *ctx, const char *path,
- const char *format_str)
-{
- FTS *tree;
- FTSENT *node;
- GArray *trace_ids;
- char lpath[PATH_MAX];
- char * const paths[2] = { lpath, NULL };
- int ret;
-
- /*
- * Need to copy path, because fts_open can change it.
- * It is the pointer array, not the strings, that are constant.
- */
- strncpy(lpath, path, PATH_MAX);
- lpath[PATH_MAX - 1] = '\0';
-
- tree = fts_open(paths, FTS_NOCHDIR | FTS_LOGICAL, 0);
- if (tree == NULL) {
- fprintf(stdout, "[error] Cannot traverse \"%s\" for reading.\n\n",
- path);
- return -EINVAL;
- }
-
- trace_ids = g_array_new(FALSE, TRUE, sizeof(int));
-
- while ((node = fts_read(tree))) {
- int dirfd, metafd;
-
- if (!(node->fts_info & FTS_D))
- continue;
-
- dirfd = open(node->fts_accpath, 0);
- if (dirfd < 0) {
- fprintf(stdout, "[warning] unable to open trace "
- "directory file descriptor.\n");
- continue;
- }
- metafd = openat(dirfd, "metadata", O_RDONLY);
- if (metafd < 0) {
- ret = close(dirfd);
- if (ret < 0) {
- perror("close");
- goto error;
- }
- } else {
- int trace_id;
-
- ret = close(metafd);
- if (ret < 0) {
- perror("close");
- goto error;
- }
- ret = close(dirfd);
- if (ret < 0) {
- perror("close");
- goto error;
- }
-
- trace_id = bt_context_add_trace(ctx,
- node->fts_accpath, format_str);
- if (trace_id < 0) {
- fprintf(stdout, "[warning] CTX opening trace \"%s\"from %s "
- "for reading.\n\n", node->fts_accpath, path);
- continue;
- }
- g_array_append_val(trace_ids, trace_id);
- }
- }
-
- g_array_free(trace_ids, TRUE);
- return 0;
-
-error:
+ ret = trace_collection_add(ctx->tc, td);
+ if (ret == 0)
+ return handle->id;
+end:
return ret;
}
projects / babeltrace.git / blobdiff