Fix: wrong type in bt_ctf_get_uint64/int64
[babeltrace.git] / formats / ctf / events.c
index 71665ce01442aeadf3af2d276014eb797faf1b46..a8b08f657680ec4ddfffe282726ff8ac2de7a988 100644 (file)
  */
 __thread int bt_ctf_last_field_error = 0;
 
-const struct definition *bt_ctf_get_top_level_scope(const 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 @@ const struct definition *bt_ctf_get_top_level_scope(const struct bt_ctf_event *e
                        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,7 +84,7 @@ error:
        return NULL;
 }
 
-const struct definition *bt_ctf_get_field(const struct bt_ctf_event *event,
+const struct definition *bt_ctf_get_field(const struct bt_ctf_event *ctf_event,
                const struct definition *scope,
                const char *field)
 {
@@ -118,7 +115,7 @@ const struct definition *bt_ctf_get_field(const struct bt_ctf_event *event,
        return NULL;
 }
 
-const struct definition *bt_ctf_get_index(const struct bt_ctf_event *event,
+const struct definition *bt_ctf_get_index(const struct bt_ctf_event *ctf_event,
                const struct definition *field,
                unsigned int index)
 {
@@ -138,10 +135,11 @@ const struct definition *bt_ctf_get_index(const struct bt_ctf_event *event,
        return ret;
 }
 
-const char *bt_ctf_event_name(const struct bt_ctf_event *event)
+const char *bt_ctf_event_name(const struct bt_ctf_event *ctf_event)
 {
        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,7 +163,7 @@ enum ctf_type_id bt_ctf_field_type(const struct definition *def)
        return CTF_TYPE_UNKNOWN;
 }
 
-int bt_ctf_get_field_list(const struct bt_ctf_event *event,
+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)
@@ -251,11 +249,12 @@ error:
        return -1;
 }
 
-struct bt_context *bt_ctf_event_get_context(const 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);
@@ -266,11 +265,12 @@ struct bt_context *bt_ctf_event_get_context(const struct bt_ctf_event *event)
        return ret;
 }
 
-int bt_ctf_event_get_handle_id(const struct bt_ctf_event *event)
+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);
@@ -281,20 +281,20 @@ int bt_ctf_event_get_handle_id(const struct bt_ctf_event *event)
        return ret;
 }
 
-uint64_t bt_ctf_get_timestamp_raw(const 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_raw(event->stream,
-                               event->stream->timestamp);
+               return event->stream->real_timestamp;
        else
                return -1ULL;
 }
 
-uint64_t bt_ctf_get_timestamp(const struct bt_ctf_event *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)
-               return ctf_get_timestamp(event->stream,
-                               event->stream->timestamp);
+               return event->stream->cycles_timestamp;
        else
                return -1ULL;
 }
@@ -355,6 +355,20 @@ int bt_ctf_get_int_byte_order(const struct definition *field)
        return ret;
 }
 
+ssize_t bt_ctf_get_int_len(const struct definition *field)
+{
+       ssize_t ret;
+
+       if (field && bt_ctf_field_type(field) == CTF_TYPE_INTEGER) {
+               ret = (ssize_t) get_int_len(field);
+       } else {
+               ret = -1;
+               bt_ctf_field_set_error(-EINVAL);
+       }
+
+       return ret;
+}
+
 enum ctf_string_encoding bt_ctf_get_encoding(const struct definition *field)
 {
        enum ctf_string_encoding ret = 0;
@@ -393,7 +407,7 @@ int bt_ctf_get_array_len(const struct definition *field)
 
 uint64_t bt_ctf_get_uint64(const struct definition *field)
 {
-       unsigned int ret = 0;
+       uint64_t ret = 0;
 
        if (field && bt_ctf_field_type(field) == CTF_TYPE_INTEGER)
                ret = get_unsigned_int(field);
@@ -405,7 +419,7 @@ uint64_t bt_ctf_get_uint64(const struct definition *field)
 
 int64_t bt_ctf_get_int64(const struct definition *field)
 {
-       int ret = 0;
+       int64_t ret = 0;
 
        if (field && bt_ctf_field_type(field) == CTF_TYPE_INTEGER)
                ret = get_signed_int(field);
@@ -439,3 +453,157 @@ 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 **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*) 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);
+}
+
+int bt_ctf_get_decl_fields(struct bt_ctf_event_decl *event_decl,
+               enum bt_ctf_scope scope,
+               struct bt_ctf_field_decl const * const **list,
+               unsigned int *count)
+{
+       int i;
+       GArray *fields = NULL;
+       gpointer *ret_list = NULL;
+       GPtrArray *fields_array = NULL;
+       int ret = 0;
+       *count = 0;
+
+       switch (scope) {
+       case BT_EVENT_CONTEXT:
+               if (event_decl->context_decl) {
+                       ret_list = event_decl->context_decl->pdata;
+                       *count = event_decl->context_decl->len;
+                       goto end;
+               }
+               event_decl->context_decl = g_ptr_array_new();
+               if (!event_decl->parent.context_decl) {
+                       ret = -1;
+                       goto end;
+               }
+               fields = event_decl->parent.context_decl->fields;
+               fields_array = event_decl->context_decl;
+               break;
+       case BT_EVENT_FIELDS:
+               if (event_decl->fields_decl) {
+                       ret_list = event_decl->fields_decl->pdata;
+                       *count = event_decl->fields_decl->len;
+                       goto end;
+               }
+               event_decl->fields_decl = g_ptr_array_new();
+               if (!event_decl->parent.fields_decl) {
+                       ret = -1;
+                       goto end;
+               }
+               fields = event_decl->parent.fields_decl->fields;
+               fields_array = event_decl->fields_decl;
+               break;
+       case BT_STREAM_PACKET_CONTEXT:
+               if (event_decl->packet_context_decl) {
+                       ret_list = event_decl->packet_context_decl->pdata;
+                       *count = event_decl->packet_context_decl->len;
+                       goto end;
+               }
+               event_decl->packet_context_decl = g_ptr_array_new();
+               if (!event_decl->parent.stream->packet_context_decl) {
+                       ret = -1;
+                       goto end;
+               }
+               fields = event_decl->parent.stream->packet_context_decl->fields;
+               fields_array = event_decl->packet_context_decl;
+               break;
+       case BT_STREAM_EVENT_CONTEXT:
+               if (event_decl->event_context_decl) {
+                       ret_list = event_decl->event_context_decl->pdata;
+                       *count = event_decl->event_context_decl->len;
+                       goto end;
+               }
+               event_decl->event_context_decl = g_ptr_array_new();
+               if (!event_decl->parent.stream->event_context_decl) {
+                       ret = -1;
+                       goto end;
+               }
+               fields = event_decl->parent.stream->event_context_decl->fields;
+               fields_array = event_decl->event_context_decl;
+               break;
+       case BT_STREAM_EVENT_HEADER:
+               if (event_decl->event_header_decl) {
+                       ret_list = event_decl->event_header_decl->pdata;
+                       *count = event_decl->event_header_decl->len;
+                       goto end;
+               }
+               event_decl->event_header_decl = g_ptr_array_new();
+               if (!event_decl->parent.stream->event_header_decl) {
+                       ret = -1;
+                       goto end;
+               }
+               fields = event_decl->parent.stream->event_header_decl->fields;
+               fields_array = event_decl->event_header_decl;
+               break;
+       case BT_TRACE_PACKET_HEADER:
+               if (event_decl->packet_header_decl) {
+                       ret_list = event_decl->packet_header_decl->pdata;
+                       *count = event_decl->packet_header_decl->len;
+                       goto end;
+               }
+               event_decl->packet_header_decl = g_ptr_array_new();
+               if (!event_decl->parent.stream->trace->packet_header_decl) {
+                       ret = -1;
+                       goto end;
+               }
+               fields = event_decl->parent.stream->trace->packet_header_decl->fields;
+               fields_array = event_decl->packet_header_decl;
+               break;
+       }
+
+       for (i = 0; i < fields->len; i++) {
+               g_ptr_array_add(fields_array,
+                               &g_array_index(fields,
+                                       struct declaration_field, i));
+       }
+       ret_list = fields_array->pdata;
+       *count = fields->len;
+
+end:
+       *list = (struct bt_ctf_field_decl const* const*) ret_list;
+
+       return ret;
+}
+
+const char *bt_ctf_get_decl_field_name(const struct bt_ctf_field_decl *field)
+{
+       if (field)
+               return rem_(g_quark_to_string(((struct declaration_field *) field)->name));
+       return NULL;
+}
This page took 0.026505 seconds and 4 git commands to generate.