projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 1.0.0-rc6
[babeltrace.git]
/
lib
/
trace-handle.c
diff --git
a/lib/trace-handle.c
b/lib/trace-handle.c
index 6ba3ec208806540e774c784eef151999c12e1c40..9cb654adbece20c2bf75aa9875a6cd3bba1e8560 100644
(file)
--- a/
lib/trace-handle.c
+++ b/
lib/trace-handle.c
@@
-31,6
+31,9
@@
struct bt_trace_handle *bt_trace_handle_create(struct bt_context *ctx)
{
struct bt_trace_handle *th;
{
struct bt_trace_handle *th;
+ if (!ctx)
+ return NULL;
+
th = g_new0(struct bt_trace_handle, 1);
th->id = ctx->last_trace_handle_id++;
return th;
th = g_new0(struct bt_trace_handle, 1);
th->id = ctx->last_trace_handle_id++;
return th;
@@
-38,11
+41,15
@@
struct bt_trace_handle *bt_trace_handle_create(struct bt_context *ctx)
void bt_trace_handle_destroy(struct bt_trace_handle *th)
{
void bt_trace_handle_destroy(struct bt_trace_handle *th)
{
+ th->format->close_trace(th->td);
g_free(th);
}
int bt_trace_handle_get_id(struct bt_trace_handle *th)
{
g_free(th);
}
int bt_trace_handle_get_id(struct bt_trace_handle *th)
{
+ if (!th)
+ return -1;
+
return th->id;
}
return th->id;
}
@@
-50,25
+57,66
@@
const char *bt_trace_handle_get_path(struct bt_context *ctx, int handle_id)
{
struct bt_trace_handle *handle;
{
struct bt_trace_handle *handle;
+ if (!ctx)
+ return NULL;
+
handle = g_hash_table_lookup(ctx->trace_handles,
(gpointer) (unsigned long) handle_id);
handle = g_hash_table_lookup(ctx->trace_handles,
(gpointer) (unsigned long) handle_id);
+ if (!handle)
+ return NULL;
return handle->path;
}
return handle->path;
}
-uint64_t bt_trace_handle_get_timestamp_begin(struct bt_context *ctx, int handle_id)
+uint64_t bt_trace_handle_get_timestamp_begin(struct bt_context *ctx,
+ int handle_id, enum bt_clock_type type)
{
struct bt_trace_handle *handle;
{
struct bt_trace_handle *handle;
+ uint64_t ret;
+
+ if (!ctx)
+ return -1ULL;
handle = g_hash_table_lookup(ctx->trace_handles,
(gpointer) (unsigned long) handle_id);
handle = g_hash_table_lookup(ctx->trace_handles,
(gpointer) (unsigned long) handle_id);
- return handle->timestamp_begin;
+ if (!handle) {
+ ret = -1ULL;
+ goto end;
+ }
+ if (type == BT_CLOCK_REAL) {
+ ret = handle->real_timestamp_begin;
+ } else if (type == BT_CLOCK_CYCLES) {
+ ret = handle->cycles_timestamp_begin;
+ } else {
+ ret = -1ULL;
+ }
+
+end:
+ return ret;
}
}
-uint64_t bt_trace_handle_get_timestamp_end(struct bt_context *ctx, int handle_id)
+uint64_t bt_trace_handle_get_timestamp_end(struct bt_context *ctx,
+ int handle_id, enum bt_clock_type type)
{
struct bt_trace_handle *handle;
{
struct bt_trace_handle *handle;
+ uint64_t ret;
+
+ if (!ctx)
+ return -1ULL;
handle = g_hash_table_lookup(ctx->trace_handles,
(gpointer) (unsigned long) handle_id);
handle = g_hash_table_lookup(ctx->trace_handles,
(gpointer) (unsigned long) handle_id);
- return handle->timestamp_end;
+ if (!handle) {
+ ret = -1ULL;
+ goto end;
+ }
+ if (type == BT_CLOCK_REAL) {
+ ret = handle->real_timestamp_end;
+ } else if (type == BT_CLOCK_CYCLES) {
+ ret = handle->cycles_timestamp_end;
+ } else {
+ ret = -1ULL;
+ }
+
+end:
+ return ret;
}
}
This page took
0.02415 seconds
and
4
git commands to generate.