Update version to 1.0.0-pre2

[babeltrace.git] / formats / ctf / events.c

diff --git a/formats/ctf/events.c b/formats/ctf/events.c
index 8ecb7c487f74384847b6f02aced03035c7ce3ee1..39620383879b3aae0076bb9aedf710e2d9c88d22 100644 (file)
--- a/formats/ctf/events.c
+++ b/formats/ctf/events.c
@@ -29,6 +29,8 @@
 #include <babeltrace/ctf/metadata.h>
 #include <glib.h>
 
+#include "events-private.h"
+
 /*
  * thread local storage to store the last error that occured
  * while reading a field, this variable must be accessed by
@@ -224,7 +226,7 @@ const char *bt_ctf_field_name(const struct definition *def)
        return NULL;
 }
 
-enum ctf_type_id bt_ctf_field_type(struct definition *def)
+enum ctf_type_id bt_ctf_field_type(const struct definition *def)
 {
        if (def)
                return def->declaration->id;
@@ -317,12 +319,22 @@ error:
        return -1;
 }
 
+uint64_t bt_ctf_get_timestamp_raw(struct bt_ctf_event *event)
+{
+       if (event && event->stream->has_timestamp)
+               return ctf_get_timestamp_raw(event->stream,
+                               event->stream->timestamp);
+       else
+               return -1ULL;
+}
+
 uint64_t bt_ctf_get_timestamp(struct bt_ctf_event *event)
 {
        if (event && event->stream->has_timestamp)
-               return event->stream->timestamp;
+               return ctf_get_timestamp(event->stream,
+                               event->stream->timestamp);
        else
-               return 0;
+               return -1ULL;
 }
 
 static void bt_ctf_field_set_error(int error)
@@ -339,7 +351,7 @@ int bt_ctf_field_get_error(void)
        return ret;
 }
 
-uint64_t bt_ctf_get_uint64(struct definition *field)
+uint64_t bt_ctf_get_uint64(const struct definition *field)
 {
        unsigned int ret = 0;
 
@@ -351,7 +363,7 @@ uint64_t bt_ctf_get_uint64(struct definition *field)
        return ret;
 }
 
-int64_t bt_ctf_get_int64(struct definition *field)
+int64_t bt_ctf_get_int64(const struct definition *field)
 {
        int ret = 0;
 
@@ -364,7 +376,7 @@ int64_t bt_ctf_get_int64(struct definition *field)
 
 }
 
-char *bt_ctf_get_char_array(struct definition *field)
+char *bt_ctf_get_char_array(const struct definition *field)
 {
        char *ret = NULL;
 
@@ -376,7 +388,7 @@ char *bt_ctf_get_char_array(struct definition *field)
        return ret;
 }
 
-char *bt_ctf_get_string(struct definition *field)
+char *bt_ctf_get_string(const struct definition *field)
 {
        char *ret = NULL;