projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: wrong type in bt_ctf_get_uint64/int64
[babeltrace.git]
/
formats
/
ctf
/
events.c
diff --git
a/formats/ctf/events.c
b/formats/ctf/events.c
index 4fa8f3036b7b0364bd6eef2e16205c95de682b0b..a8b08f657680ec4ddfffe282726ff8ac2de7a988 100644
(file)
--- a/
formats/ctf/events.c
+++ b/
formats/ctf/events.c
@@
-281,22
+281,20
@@
int bt_ctf_event_get_handle_id(const struct bt_ctf_event *ctf_event)
return ret;
}
return ret;
}
-uint64_t bt_ctf_get_timestamp
_raw
(const struct bt_ctf_event *ctf_event)
+uint64_t bt_ctf_get_timestamp(const struct bt_ctf_event *ctf_event)
{
struct ctf_event_definition *event = ctf_event->parent;
if (event && event->stream->has_timestamp)
{
struct ctf_event_definition *event = ctf_event->parent;
if (event && event->stream->has_timestamp)
- return ctf_get_timestamp_raw(event->stream,
- event->stream->timestamp);
+ return event->stream->real_timestamp;
else
return -1ULL;
}
else
return -1ULL;
}
-uint64_t bt_ctf_get_
timestamp
(const struct bt_ctf_event *ctf_event)
+uint64_t bt_ctf_get_
cycles
(const struct bt_ctf_event *ctf_event)
{
struct ctf_event_definition *event = ctf_event->parent;
if (event && event->stream->has_timestamp)
{
struct ctf_event_definition *event = ctf_event->parent;
if (event && event->stream->has_timestamp)
- return ctf_get_timestamp(event->stream,
- event->stream->timestamp);
+ return event->stream->cycles_timestamp;
else
return -1ULL;
}
else
return -1ULL;
}
@@
-409,7
+407,7
@@
int bt_ctf_get_array_len(const struct definition *field)
uint64_t bt_ctf_get_uint64(const struct definition *field)
{
uint64_t bt_ctf_get_uint64(const struct definition *field)
{
- u
nsigned in
t ret = 0;
+ u
int64_
t ret = 0;
if (field && bt_ctf_field_type(field) == CTF_TYPE_INTEGER)
ret = get_unsigned_int(field);
if (field && bt_ctf_field_type(field) == CTF_TYPE_INTEGER)
ret = get_unsigned_int(field);
@@
-421,7
+419,7
@@
uint64_t bt_ctf_get_uint64(const struct definition *field)
int64_t bt_ctf_get_int64(const struct definition *field)
{
int64_t bt_ctf_get_int64(const struct definition *field)
{
- int ret = 0;
+ int
64_t
ret = 0;
if (field && bt_ctf_field_type(field) == CTF_TYPE_INTEGER)
ret = get_signed_int(field);
if (field && bt_ctf_field_type(field) == CTF_TYPE_INTEGER)
ret = get_signed_int(field);
This page took
0.023421 seconds
and
4
git commands to generate.