[ CTF_TYPE_STRING ] = ctf_string_read,
[ CTF_TYPE_STRUCT ] = ctf_struct_rw,
[ CTF_TYPE_VARIANT ] = ctf_variant_rw,
- [ CTF_TYPE_ARRAY ] = ctf_array_rw,
- [ CTF_TYPE_SEQUENCE ] = ctf_sequence_rw,
+ [ CTF_TYPE_ARRAY ] = ctf_array_read,
+ [ CTF_TYPE_SEQUENCE ] = ctf_sequence_read,
};
static
[ CTF_TYPE_STRING ] = ctf_string_write,
[ CTF_TYPE_STRUCT ] = ctf_struct_rw,
[ CTF_TYPE_VARIANT ] = ctf_variant_rw,
- [ CTF_TYPE_ARRAY ] = ctf_array_rw,
- [ CTF_TYPE_SEQUENCE ] = ctf_sequence_rw,
+ [ CTF_TYPE_ARRAY ] = ctf_array_write,
+ [ CTF_TYPE_SEQUENCE ] = ctf_sequence_write,
};
static
struct ctf_stream_class *stream_class = stream->stream_class;
struct ctf_event *event_class;
uint64_t id = 0;
- int len_index;
int ret;
if (pos->offset == EOF)
/* Read event header */
if (stream_class->event_header) {
+ struct definition_integer *integer_definition;
+
ret = generic_rw(ppos, &stream_class->event_header->p);
if (ret)
goto error;
/* 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;
+ 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;
- 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 */
+ enum_definition = lookup_enum(&stream_class->event_header->p, "id", FALSE);
+ if (enum_definition) {
+ id = enum_definition->integer->value._unsigned;
+ }
}
/* lookup timestamp */
- len_index = struct_declaration_lookup_field_index(stream_class->event_header_decl,
- g_quark_from_static_string("timestamp"));
- if (len_index >= 0) {
- struct definition_integer *defint;
- struct definition *field;
+ integer_definition = lookup_integer(&stream_class->event_header->p, "timestamp", FALSE);
+ if (integer_definition) {
+ stream->timestamp = integer_definition->value._unsigned;
+ } else {
+ struct definition *definition;
- 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);
- /* update timestamp */
- stream->timestamp = defint->value._unsigned;
+ 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 (integer_definition) {
+ stream->timestamp = integer_definition->value._unsigned;
+ }
+ }
}
-
}
/* Read stream-declared event context */
ret = -EINVAL;
break;
}
- printf("read %s\n", buf);
+ if (babeltrace_debug) {
+ fprintf(stdout, "[debug] metadata packet read: %s\n",
+ buf);
+ }
+
writelen = fwrite(buf, sizeof(char), readlen, out);
if (writelen < readlen) {
ret = -EIO;