projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make the signedness warning useful with the field name
[babeltrace.git]
/
lib
/
context.c
diff --git
a/lib/context.c
b/lib/context.c
index dbab33754cab346ba6c8a2054d72398338ffde23..bedcc42042e0c95353e930aa0ede89ba2297c45d 100644
(file)
--- a/
lib/context.c
+++ b/
lib/context.c
@@
-79,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;
@@
-104,6
+104,8
@@
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';
@@
-133,14
+135,13
@@
void bt_context_remove_trace(struct bt_context *ctx, int handle_id)
/* Remove from containers */
trace_collection_remove(ctx->tc, handle->td);
/* Remove from containers */
trace_collection_remove(ctx->tc, handle->td);
- g_hash_table_remove(ctx->trace_handles,
- (gpointer) (unsigned long) handle_id);
-
/* Close the trace */
handle->format->close_trace(handle->td);
/* Close the trace */
handle->format->close_trace(handle->td);
- /* Destory the handle */
- bt_trace_handle_destroy(handle);
+ /* Remove and free the handle */
+ g_hash_table_remove(ctx->trace_handles,
+ (gpointer) (unsigned long) handle_id);
+
}
static
}
static
This page took
0.027841 seconds
and
4
git commands to generate.