int field_nr_saved;
struct ctf_event *event_class;
uint64_t id = 0;
- int len_index;
int ret;
/* print event header */
if (stream_class->event_header) {
+ struct definition_integer *integer_definition;
+ struct definition *variant;
+
/* lookup event id */
- len_index = struct_declaration_lookup_field_index(stream_class->event_header_decl,
- g_quark_from_static_string("id"));
- if (len_index >= 0) {
- struct definition_integer *defint;
- struct definition *field;
-
- field = struct_definition_get_field_from_index(stream_class->event_header, len_index);
- assert(field->declaration->id == CTF_TYPE_INTEGER);
- defint = container_of(field, struct definition_integer, p);
- assert(defint->declaration->signedness == FALSE);
- id = defint->value._unsigned; /* set id */
+ integer_definition = lookup_integer(&stream_class->event_header->p, "id", FALSE);
+ if (integer_definition) {
+ id = integer_definition->value._unsigned;
+ } else {
+ struct definition_enum *enum_definition;
+
+ enum_definition = lookup_enum(&stream_class->event_header->p, "id", FALSE);
+ if (enum_definition) {
+ id = enum_definition->integer->value._unsigned;
+ }
+ }
+
+ variant = lookup_variant(&stream_class->event_header->p, "v");
+ if (variant) {
+ integer_definition = lookup_integer(variant, "id", FALSE);
+ if (integer_definition) {
+ id = integer_definition->value._unsigned;
+ }
}
}
struct ctf_text_stream_pos *pos = ctf_text_pos(ppos);
GArray *qs;
int i, ret;
+ int field_nr_saved;
if (pos->dummy)
return 0;
fprintf(pos->fp, "%s = ",
g_quark_to_string(definition->name));
+ field_nr_saved = pos->field_nr;
+ pos->field_nr = 0;
fprintf(pos->fp, "(");
pos->depth++;
ret = generic_rw(ppos, &integer_definition->p);
- fprintf(pos->fp, " :");
+ fprintf(pos->fp, ":");
qs = enum_definition->value;
assert(qs);
+ pos->field_nr = 0;
for (i = 0; i < qs->len; i++) {
GQuark q = g_array_index(qs, GQuark, i);
const char *str = g_quark_to_string(q);
- if (i != 0)
+ assert(str);
+ if (pos->field_nr++ != 0)
fprintf(pos->fp, ",");
fprintf(pos->fp, " ");
- fprintf(pos->fp, "%s\n", str);
+ fprintf(pos->fp, "%s", str);
}
pos->depth--;
fprintf(pos->fp, " )");
+ pos->field_nr = field_nr_saved;
return ret;
}
/* Read event header */
if (stream_class->event_header) {
struct definition_integer *integer_definition;
+ struct definition *variant;
ret = generic_rw(ppos, &stream_class->event_header->p);
if (ret)
}
}
+ variant = lookup_variant(&stream_class->event_header->p, "v");
+ if (variant) {
+ integer_definition = lookup_integer(variant, "id", FALSE);
+ if (integer_definition) {
+ id = integer_definition->value._unsigned;
+ }
+ }
+
/* lookup timestamp */
integer_definition = lookup_integer(&stream_class->event_header->p, "timestamp", FALSE);
if (integer_definition) {
stream->timestamp = integer_definition->value._unsigned;
} else {
- struct definition *definition;
-
- definition = lookup_variant(&stream_class->event_header->p, "v");
- if (definition) {
- integer_definition = lookup_integer(definition, "id", FALSE);
- if (integer_definition) {
- id = integer_definition->value._unsigned;
- }
- integer_definition = lookup_integer(definition, "timestamp", FALSE);
+ if (variant) {
+ integer_definition = lookup_integer(variant, "timestamp", FALSE);
if (integer_definition) {
stream->timestamp = integer_definition->value._unsigned;
}
struct ctf_stream_class *stream_class = stream->stream_class;
struct ctf_event *event_class;
uint64_t id = 0;
- int len_index;
int ret;
/* print event header */
if (stream_class->event_header) {
+ struct definition_integer *integer_definition;
+ struct definition *variant;
+
/* lookup event id */
- len_index = struct_declaration_lookup_field_index(stream_class->event_header_decl,
- g_quark_from_static_string("id"));
- if (len_index >= 0) {
- struct definition_integer *defint;
- struct definition *field;
-
- field = struct_definition_get_field_from_index(stream_class->event_header, len_index);
- assert(field->declaration->id == CTF_TYPE_INTEGER);
- defint = container_of(field, struct definition_integer, p);
- assert(defint->declaration->signedness == FALSE);
- id = defint->value._unsigned; /* set id */
+ integer_definition = lookup_integer(&stream_class->event_header->p, "id", FALSE);
+ if (integer_definition) {
+ id = integer_definition->value._unsigned;
+ } else {
+ struct definition_enum *enum_definition;
+
+ enum_definition = lookup_enum(&stream_class->event_header->p, "id", FALSE);
+ if (enum_definition) {
+ id = enum_definition->integer->value._unsigned;
+ }
+ }
+
+ variant = lookup_variant(&stream_class->event_header->p, "v");
+ if (variant) {
+ integer_definition = lookup_integer(variant, "id", FALSE);
+ if (integer_definition) {
+ id = integer_definition->value._unsigned;
+ }
}
ret = generic_rw(pos, &stream_class->event_header->p);
if (qs)
qs_len = qs->len;
ranges = g_array_sized_new(FALSE, TRUE,
- sizeof(struct enum_range),
+ sizeof(GQuark),
qs_len + 1);
g_array_set_size(ranges, qs_len + 1);
if (qs)
memcpy(ranges->data, qs->data,
- sizeof(struct enum_range) * qs_len);
- g_array_index(ranges, struct enum_range, qs_len) = iter->range;
+ sizeof(GQuark) * qs_len);
+ g_array_index(ranges, GQuark, qs_len) = iter->quark;
} else {
size_t qs_len = ranges->len;
g_array_set_size(ranges, qs_len + 1);
- g_array_index(ranges, struct enum_range, qs_len) = iter->range;
+ g_array_index(ranges, GQuark, qs_len) = iter->quark;
}
}
if (!ranges) {
if (qs)
qs_len = qs->len;
ranges = g_array_sized_new(FALSE, TRUE,
- sizeof(struct enum_range),
+ sizeof(GQuark),
qs_len + 1);
g_array_set_size(ranges, qs_len + 1);
if (qs)
memcpy(ranges->data, qs->data,
- sizeof(struct enum_range) * qs_len);
- g_array_index(ranges, struct enum_range, qs_len) = iter->range;
+ sizeof(GQuark) * qs_len);
+ g_array_index(ranges, GQuark, qs_len) = iter->quark;
} else {
size_t qs_len = ranges->len;
g_array_set_size(ranges, qs_len + 1);
- g_array_index(ranges, struct enum_range, qs_len) = iter->range;
+ g_array_index(ranges, GQuark, qs_len) = iter->quark;
}
}
if (!ranges) {