projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: babeltrace should skip erroneous traces
[babeltrace.git]
/
lib
/
context.c
diff --git
a/lib/context.c
b/lib/context.c
index 0c20ed53de6b247ff996a85e0c49ca9b91fd0793..d6b1ec8b6ba71f48e5ffe9428baf3a89f8cc42df 100644
(file)
--- a/
lib/context.c
+++ b/
lib/context.c
@@
-50,6
+50,7
@@
struct bt_context *bt_context_create(void)
g_direct_equal, NULL,
(GDestroyNotify) bt_trace_handle_destroy);
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);
ctx->tc = g_new0(struct trace_collection, 1);
init_trace_collection(ctx->tc);
@@
-78,7
+79,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) {
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;
path);
ret = -1;
goto end;
@@
-103,9
+104,16
@@
int bt_context_add_trace(struct bt_context *ctx, const char *path,
}
handle->format = fmt;
handle->td = td;
}
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';
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,
/* Add new handle to container */
g_hash_table_insert(ctx->trace_handles,
(gpointer) (unsigned long) handle->id,
This page took
0.023508 seconds
and
4
git commands to generate.