API fix/breakage : reexporting bt_ctf_event
[babeltrace.git] / formats / ctf / events.c
index eea58cfd796ffeec39d13c381d4216dcb4128c14..b33796bc2dfbc9580e46b57d88848de266445862 100644 (file)
  */
 __thread int bt_ctf_last_field_error = 0;
 
-struct bt_ctf_iter *bt_ctf_iter_create(struct bt_context *ctx,
-               struct bt_iter_pos *begin_pos,
-               struct bt_iter_pos *end_pos)
-{
-       struct bt_ctf_iter *iter;
-       int ret;
-
-       iter = g_new0(struct bt_ctf_iter, 1);
-       ret = bt_iter_init(&iter->parent, ctx, begin_pos, end_pos);
-       if (ret) {
-               g_free(iter);
-               return NULL;
-       }
-       iter->callbacks = g_array_new(0, 1, sizeof(struct bt_stream_callbacks));
-       iter->recalculate_dep_graph = 0;
-       iter->main_callbacks.callback = NULL;
-       iter->dep_gc = g_ptr_array_new();
-       return iter;
-}
-
-void bt_ctf_iter_destroy(struct bt_ctf_iter *iter)
-{
-       struct bt_stream_callbacks *bt_stream_cb;
-       struct bt_callback_chain *bt_chain;
-       int i, j;
-
-       /* free all events callbacks */
-       if (iter->main_callbacks.callback)
-               g_array_free(iter->main_callbacks.callback, TRUE);
-
-       /* free per-event callbacks */
-       for (i = 0; i < iter->callbacks->len; i++) {
-               bt_stream_cb = &g_array_index(iter->callbacks,
-                               struct bt_stream_callbacks, i);
-               if (!bt_stream_cb || !bt_stream_cb->per_id_callbacks)
-                       continue;
-               for (j = 0; j < bt_stream_cb->per_id_callbacks->len; j++) {
-                       bt_chain = &g_array_index(bt_stream_cb->per_id_callbacks,
-                                       struct bt_callback_chain, j);
-                       if (bt_chain->callback) {
-                               g_array_free(bt_chain->callback, TRUE);
-                       }
-               }
-               g_array_free(bt_stream_cb->per_id_callbacks, TRUE);
-       }
-
-       bt_iter_fini(&iter->parent);
-       g_free(iter);
-}
-
-struct bt_iter *bt_ctf_get_iter(struct bt_ctf_iter *iter)
-{
-       return &iter->parent;
-}
-
-struct bt_ctf_event *bt_ctf_iter_read_event(struct bt_ctf_iter *iter)
-{
-       struct ctf_file_stream *file_stream;
-       struct bt_ctf_event *ret = &iter->current_ctf_event;
-
-       file_stream = heap_maximum(iter->parent.stream_heap);
-       if (!file_stream) {
-               /* end of file for all streams */
-               goto stop;
-       }
-       ret->stream = &file_stream->parent;
-       ret->event = g_ptr_array_index(ret->stream->events_by_id,
-                       ret->stream->event_id);
-
-       if (ret->stream->stream_id > iter->callbacks->len)
-               goto end;
-
-       process_callbacks(iter, ret->stream);
-
-end:
-       return ret;
-stop:
-       return NULL;
-}
-
-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:
@@ -149,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;
@@ -167,14 +84,26 @@ 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;
+       char *field_underscore;
 
        if (scope) {
                def = lookup_definition(scope, field);
+               /*
+                * optionally a field can have an underscore prefix, try
+                * to lookup the field with this prefix if it failed
+                */
+               if (!def) {
+                       field_underscore = g_new(char, strlen(field) + 2);
+                       field_underscore[0] = '_';
+                       strcpy(&field_underscore[1], field);
+                       def = lookup_definition(scope, field_underscore);
+                       g_free(field_underscore);
+               }
                if (bt_ctf_field_type(def) == CTF_TYPE_VARIANT) {
                        struct definition_variant *variant_definition;
                        variant_definition = container_of(def,
@@ -186,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;
@@ -206,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;
@@ -222,7 +152,7 @@ const char *bt_ctf_event_name(struct bt_ctf_event *event)
 const char *bt_ctf_field_name(const struct definition *def)
 {
        if (def)
-               return g_quark_to_string(def->name);
+               return rem_(g_quark_to_string(def->name));
        return NULL;
 }
 
@@ -233,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)
 {
@@ -246,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) {
@@ -263,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) {
@@ -278,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) {
@@ -293,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) {
@@ -319,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);
@@ -328,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);
This page took 0.026684 seconds and 4 git commands to generate.