projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ctf.fs: bt_ctf_notif_iter_create(): assert() that all medops exist
[babeltrace.git]
/
lib
/
trace-handle.c
diff --git
a/lib/trace-handle.c
b/lib/trace-handle.c
index d5b906aa961f5639b51f9a7c9114a19c28f58f3a..4c41d2fdf8876cde8c4482c7c7d215fe369ce130 100644
(file)
--- a/
lib/trace-handle.c
+++ b/
lib/trace-handle.c
@@
-60,60
+60,62
@@
const char *bt_trace_handle_get_path(struct bt_context *ctx, int handle_id)
return NULL;
handle = g_hash_table_lookup(ctx->trace_handles,
return NULL;
handle = g_hash_table_lookup(ctx->trace_handles,
-
(gpointer) (unsigned long) handle_id
);
+
GUINT_TO_POINTER(handle_id)
);
if (!handle)
return NULL;
return handle->path;
}
if (!handle)
return NULL;
return handle->path;
}
-uint64_t bt_trace_handle_get_timestamp_begin(struct bt_context *ctx,
- int handle_id, enum bt_clock_type type)
+int bt_trace_handle_get_timestamp_begin(struct bt_context *ctx,
+ int handle_id, enum bt_clock_type type,
+ int64_t *timestamp)
{
struct bt_trace_handle *handle;
{
struct bt_trace_handle *handle;
-
uint64_t ret
;
+
int ret = 0
;
- if (!ctx)
- return -1
ULL
;
+ if (!ctx
|| !timestamp
)
+ return -1;
handle = g_hash_table_lookup(ctx->trace_handles,
handle = g_hash_table_lookup(ctx->trace_handles,
-
(gpointer) (unsigned long) handle_id
);
+
GUINT_TO_POINTER(handle_id)
);
if (!handle) {
if (!handle) {
- ret = -1
ULL
;
+ ret = -1;
goto end;
}
if (type == BT_CLOCK_REAL) {
goto end;
}
if (type == BT_CLOCK_REAL) {
-
ret
= handle->real_timestamp_begin;
+
*timestamp
= handle->real_timestamp_begin;
} else if (type == BT_CLOCK_CYCLES) {
} else if (type == BT_CLOCK_CYCLES) {
-
ret
= handle->cycles_timestamp_begin;
+
*timestamp
= handle->cycles_timestamp_begin;
} else {
} else {
- ret = -1
ULL
;
+ ret = -1;
}
end:
return ret;
}
}
end:
return ret;
}
-uint64_t bt_trace_handle_get_timestamp_end(struct bt_context *ctx,
- int handle_id, enum bt_clock_type type)
+int bt_trace_handle_get_timestamp_end(struct bt_context *ctx,
+ int handle_id, enum bt_clock_type type,
+ int64_t *timestamp)
{
struct bt_trace_handle *handle;
{
struct bt_trace_handle *handle;
-
uint64_t ret
;
+
int ret = 0
;
- if (!ctx)
- return -1
ULL
;
+ if (!ctx
|| !timestamp
)
+ return -1;
handle = g_hash_table_lookup(ctx->trace_handles,
handle = g_hash_table_lookup(ctx->trace_handles,
-
(gpointer) (unsigned long) handle_id
);
+
GUINT_TO_POINTER(handle_id)
);
if (!handle) {
if (!handle) {
- ret = -1
ULL
;
+ ret = -1;
goto end;
}
if (type == BT_CLOCK_REAL) {
goto end;
}
if (type == BT_CLOCK_REAL) {
-
ret
= handle->real_timestamp_end;
+
*timestamp
= handle->real_timestamp_end;
} else if (type == BT_CLOCK_CYCLES) {
} else if (type == BT_CLOCK_CYCLES) {
-
ret
= handle->cycles_timestamp_end;
+
*timestamp
= handle->cycles_timestamp_end;
} else {
} else {
- ret = -1
ULL
;
+ ret = -1;
}
end:
}
end:
This page took
0.02537 seconds
and
4
git commands to generate.