API fix : fill the values for timestamp begin and end

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

diff --git a/formats/ctf/events.c b/formats/ctf/events.c
index 0e32d21e3542b72bee804c6eba37a39527e0c9ea..13c7411a1fe2c89e462cc0a686236be8dd0989fa 100644 (file)
--- a/formats/ctf/events.c
+++ b/formats/ctf/events.c
@@ -38,10 +38,11 @@
  */
 __thread int bt_ctf_last_field_error = 0;
 
-struct definition *bt_ctf_get_top_level_scope(struct bt_ctf_event *event,
+const struct definition *bt_ctf_get_top_level_scope(const struct bt_ctf_event *ctf_event,
                enum bt_ctf_scope scope)
 {
        struct definition *tmp = NULL;
+       struct ctf_event_definition *event = ctf_event->parent;
 
        switch (scope) {
        case BT_TRACE_PACKET_HEADER:
@@ -69,16 +70,12 @@ struct definition *bt_ctf_get_top_level_scope(struct bt_ctf_event *event,
                        tmp = &event->stream->stream_event_context->p;
                break;
        case BT_EVENT_CONTEXT:
-               if (!event->event)
-                       goto error;
-               if (event->event->event_context)
-                       tmp = &event->event->event_context->p;
+               if (event->event_context)
+                       tmp = &event->event_context->p;
                break;
        case BT_EVENT_FIELDS:
-               if (!event->event)
-                       goto error;
-               if (event->event->event_fields)
-                       tmp = &event->event->event_fields->p;
+               if (event->event_fields)
+                       tmp = &event->event_fields->p;
                break;
        }
        return tmp;
@@ -87,8 +84,8 @@ error:
        return NULL;
 }
 
-struct definition *bt_ctf_get_field(struct bt_ctf_event *event,
-               struct definition *scope,
+const struct definition *bt_ctf_get_field(const struct bt_ctf_event *ctf_event,
+               const struct definition *scope,
                const char *field)
 {
        struct definition *def;
@@ -118,8 +115,8 @@ struct definition *bt_ctf_get_field(struct bt_ctf_event *event,
        return NULL;
 }
 
-struct definition *bt_ctf_get_index(struct bt_ctf_event *event,
-               struct definition *field,
+const struct definition *bt_ctf_get_index(const struct bt_ctf_event *ctf_event,
+               const struct definition *field,
                unsigned int index)
 {
        struct definition *ret = NULL;
@@ -138,10 +135,11 @@ struct definition *bt_ctf_get_index(struct bt_ctf_event *event,
        return ret;
 }
 
-const char *bt_ctf_event_name(struct bt_ctf_event *event)
+const char *bt_ctf_event_name(const struct bt_ctf_event *ctf_event)
 {
-       struct ctf_event *event_class;
-       struct ctf_stream_class *stream_class;
+       struct ctf_event_declaration *event_class;
+       struct ctf_stream_declaration *stream_class;
+       struct ctf_event_definition *event = ctf_event->parent;
 
        if (!event)
                return NULL;
@@ -165,8 +163,8 @@ enum ctf_type_id bt_ctf_field_type(const struct definition *def)
        return CTF_TYPE_UNKNOWN;
 }
 
-int bt_ctf_get_field_list(struct bt_ctf_event *event,
-               struct definition *scope,
+int bt_ctf_get_field_list(const struct bt_ctf_event *ctf_event,
+               const struct definition *scope,
                struct definition const * const **list,
                unsigned int *count)
 {
@@ -178,9 +176,9 @@ int bt_ctf_get_field_list(struct bt_ctf_event *event,
                goto error;
        case CTF_TYPE_STRUCT:
        {
-               struct definition_struct *def_struct;
+               const struct definition_struct *def_struct;
 
-               def_struct = container_of(scope, struct definition_struct, p);
+               def_struct = container_of(scope, const struct definition_struct, p);
                if (!def_struct)
                        goto error;
                if (def_struct->fields->pdata) {
@@ -195,9 +193,9 @@ int bt_ctf_get_field_list(struct bt_ctf_event *event,
                goto error;
        case CTF_TYPE_VARIANT:
        {
-               struct definition_variant *def_variant;
+               const struct definition_variant *def_variant;
 
-               def_variant = container_of(scope, struct definition_variant, p);
+               def_variant = container_of(scope, const struct definition_variant, p);
                if (!def_variant)
                        goto error;
                if (def_variant->fields->pdata) {
@@ -210,9 +208,9 @@ int bt_ctf_get_field_list(struct bt_ctf_event *event,
        }
        case CTF_TYPE_ARRAY:
        {
-               struct definition_array *def_array;
+               const struct definition_array *def_array;
 
-               def_array = container_of(scope, struct definition_array, p);
+               def_array = container_of(scope, const struct definition_array, p);
                if (!def_array)
                        goto error;
                if (def_array->elems->pdata) {
@@ -225,9 +223,9 @@ int bt_ctf_get_field_list(struct bt_ctf_event *event,
        }
        case CTF_TYPE_SEQUENCE:
        {
-               struct definition_sequence *def_sequence;
+               const struct definition_sequence *def_sequence;
 
-               def_sequence = container_of(scope, struct definition_sequence, p);
+               def_sequence = container_of(scope, const struct definition_sequence, p);
                if (!def_sequence)
                        goto error;
                if (def_sequence->elems->pdata) {
@@ -251,8 +249,41 @@ error:
        return -1;
 }
 
-uint64_t bt_ctf_get_timestamp_raw(struct bt_ctf_event *event)
+struct bt_context *bt_ctf_event_get_context(const struct bt_ctf_event *ctf_event)
 {
+       struct bt_context *ret = NULL;
+       struct ctf_file_stream *cfs;
+       struct ctf_trace *trace;
+       struct ctf_event_definition *event = ctf_event->parent;
+
+       cfs = container_of(event->stream, struct ctf_file_stream,
+                       parent);
+       trace = cfs->parent.stream_class->trace;
+       if (trace->ctx)
+               ret = trace->ctx;
+
+       return ret;
+}
+
+int bt_ctf_event_get_handle_id(const struct bt_ctf_event *ctf_event)
+{
+       int ret = -1;
+       struct ctf_file_stream *cfs;
+       struct ctf_trace *trace;
+       struct ctf_event_definition *event = ctf_event->parent;
+
+       cfs = container_of(event->stream, struct ctf_file_stream,
+                       parent);
+       trace = cfs->parent.stream_class->trace;
+       if (trace->handle)
+               ret = trace->handle->id;
+
+       return ret;
+}
+
+uint64_t bt_ctf_get_timestamp_raw(const struct bt_ctf_event *ctf_event)
+{
+       struct ctf_event_definition *event = ctf_event->parent;
        if (event && event->stream->has_timestamp)
                return ctf_get_timestamp_raw(event->stream,
                                event->stream->timestamp);
@@ -260,8 +291,9 @@ uint64_t bt_ctf_get_timestamp_raw(struct bt_ctf_event *event)
                return -1ULL;
 }
 
-uint64_t bt_ctf_get_timestamp(struct bt_ctf_event *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)
                return ctf_get_timestamp(event->stream,
                                event->stream->timestamp);
@@ -409,3 +441,37 @@ char *bt_ctf_get_string(const struct definition *field)
 
        return ret;
 }
+
+int bt_ctf_get_event_decl_list(int handle_id, struct bt_context *ctx,
+               struct bt_ctf_event_decl const * const **list,
+               unsigned int *count)
+{
+       struct bt_trace_handle *handle;
+       struct trace_descriptor *td;
+       struct ctf_trace *tin;
+
+       if (!ctx)
+               goto error;
+
+       handle = g_hash_table_lookup(ctx->trace_handles,
+                       (gpointer) (unsigned long) handle_id);
+       if (!handle)
+               goto error;
+
+       td = handle->td;
+       tin = container_of(td, struct ctf_trace, parent);
+
+       *list = (struct bt_ctf_event_decl const* const*) tin->event_declarations->pdata;
+       *count = tin->event_declarations->len;
+       return 0;
+
+error:
+       return -1;
+}
+
+const char *bt_ctf_get_decl_event_name(const struct bt_ctf_event_decl *event)
+{
+       if (!event)
+               return NULL;
+       return g_quark_to_string(event->parent.name);
+}