X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-visitor-generate-io-struct.c;h=4b399613585ebb81b9aa49d25c23583690483003;hp=2d3361cbdc5d3d889cbeed4ff7b281e0c8b2473c;hb=325392affbbb6aaf2caf13836e7ba7c0d29c90a3;hpb=bf94ab2bcad1aa584a1ecc763ce390d583b62f0c diff --git a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c index 2d3361cb..4b399613 100644 --- a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c +++ b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c @@ -23,21 +23,23 @@ #include #include #include -#include #include #include #include #include #include -#include +#include +#include #include "ctf-scanner.h" #include "ctf-parser.h" #include "ctf-ast.h" #define fprintf_dbg(fd, fmt, args...) fprintf(fd, "%s: " fmt, __func__, ## args) -#define _cds_list_first_entry(ptr, type, member) \ - cds_list_entry((ptr)->next, type, member) +#define _bt_list_first_entry(ptr, type, member) \ + bt_list_entry((ptr)->next, type, member) + +int opt_clock_force_correlate; static struct declaration *ctf_type_specifier_list_visit(FILE *fd, @@ -49,18 +51,32 @@ static int ctf_stream_visit(FILE *fd, int depth, struct ctf_node *node, struct declaration_scope *parent_declaration_scope, struct ctf_trace *trace); +static +int is_unary_string(struct bt_list_head *head) +{ + struct ctf_node *node; + + bt_list_for_each_entry(node, head, siblings) { + if (node->type != NODE_UNARY_EXPRESSION) + return 0; + if (node->u.unary_expression.type != UNARY_STRING) + return 0; + } + return 1; +} + /* * String returned must be freed by the caller using g_free. */ static -char *concatenate_unary_strings(struct cds_list_head *head) +char *concatenate_unary_strings(struct bt_list_head *head) { struct ctf_node *node; GString *str; int i = 0; str = g_string_new(""); - cds_list_for_each_entry(node, head, siblings) { + bt_list_for_each_entry(node, head, siblings) { char *src_string; assert(node->type == NODE_UNARY_EXPRESSION); @@ -88,13 +104,13 @@ char *concatenate_unary_strings(struct cds_list_head *head) } static -GQuark get_map_clock_name_value(struct cds_list_head *head) +GQuark get_map_clock_name_value(struct bt_list_head *head) { struct ctf_node *node; const char *name = NULL; int i = 0; - cds_list_for_each_entry(node, head, siblings) { + bt_list_for_each_entry(node, head, siblings) { char *src_string; assert(node->type == NODE_UNARY_EXPRESSION); @@ -132,12 +148,26 @@ GQuark get_map_clock_name_value(struct cds_list_head *head) } static -int get_unary_unsigned(struct cds_list_head *head, uint64_t *value) +int is_unary_unsigned(struct bt_list_head *head) +{ + struct ctf_node *node; + + bt_list_for_each_entry(node, head, siblings) { + if (node->type != NODE_UNARY_EXPRESSION) + return 0; + if (node->u.unary_expression.type != UNARY_UNSIGNED_CONSTANT) + return 0; + } + return 1; +} + +static +int get_unary_unsigned(struct bt_list_head *head, uint64_t *value) { struct ctf_node *node; int i = 0; - cds_list_for_each_entry(node, head, siblings) { + bt_list_for_each_entry(node, head, siblings) { assert(node->type == NODE_UNARY_EXPRESSION); assert(node->u.unary_expression.type == UNARY_UNSIGNED_CONSTANT); assert(node->u.unary_expression.link == UNARY_LINK_UNKNOWN); @@ -149,12 +179,26 @@ int get_unary_unsigned(struct cds_list_head *head, uint64_t *value) } static -int get_unary_signed(struct cds_list_head *head, int64_t *value) +int is_unary_signed(struct bt_list_head *head) +{ + struct ctf_node *node; + + bt_list_for_each_entry(node, head, siblings) { + if (node->type != NODE_UNARY_EXPRESSION) + return 0; + if (node->u.unary_expression.type != UNARY_SIGNED_CONSTANT) + return 0; + } + return 1; +} + +static +int get_unary_signed(struct bt_list_head *head, int64_t *value) { struct ctf_node *node; int i = 0; - cds_list_for_each_entry(node, head, siblings) { + bt_list_for_each_entry(node, head, siblings) { assert(node->type == NODE_UNARY_EXPRESSION); assert(node->u.unary_expression.type == UNARY_UNSIGNED_CONSTANT || node->u.unary_expression.type == UNARY_SIGNED_CONSTANT); @@ -176,13 +220,13 @@ int get_unary_signed(struct cds_list_head *head, int64_t *value) } static -int get_unary_uuid(struct cds_list_head *head, uuid_t *uuid) +int get_unary_uuid(struct bt_list_head *head, unsigned char *uuid) { struct ctf_node *node; int i = 0; int ret = -1; - cds_list_for_each_entry(node, head, siblings) { + bt_list_for_each_entry(node, head, siblings) { const char *src_string; assert(node->type == NODE_UNARY_EXPRESSION); @@ -190,13 +234,13 @@ int get_unary_uuid(struct cds_list_head *head, uuid_t *uuid) assert(node->u.unary_expression.link == UNARY_LINK_UNKNOWN); assert(i == 0); src_string = node->u.unary_expression.u.string; - ret = uuid_parse(src_string, *uuid); + ret = babeltrace_uuid_parse(src_string, uuid); } return ret; } static -struct ctf_stream_class *trace_stream_lookup(struct ctf_trace *trace, uint64_t stream_id) +struct ctf_stream_declaration *trace_stream_lookup(struct ctf_trace *trace, uint64_t stream_id) { if (trace->streams->len <= stream_id) return NULL; @@ -311,7 +355,7 @@ int visit_type_specifier_list(FILE *fd, struct ctf_node *type_specifier_list, GS int alias_item_nr = 0; int ret; - cds_list_for_each_entry(iter, &type_specifier_list->u.type_specifier_list.head, siblings) { + bt_list_for_each_entry(iter, &type_specifier_list->u.type_specifier_list.head, siblings) { if (alias_item_nr != 0) g_string_append(str, " "); alias_item_nr++; @@ -339,7 +383,7 @@ GQuark create_typealias_identifier(FILE *fd, int depth, g_string_free(str, TRUE); return 0; } - cds_list_for_each_entry(iter, &node_type_declarator->u.type_declarator.pointers, siblings) { + bt_list_for_each_entry(iter, &node_type_declarator->u.type_declarator.pointers, siblings) { g_string_append(str, " *"); if (iter->u.pointer.const_qualifier) g_string_append(str, " const"); @@ -376,7 +420,7 @@ struct declaration *ctf_type_declarator_visit(FILE *fd, int depth, } if (!nested_declaration) { - if (node_type_declarator && !cds_list_empty(&node_type_declarator->u.type_declarator.pointers)) { + if (node_type_declarator && !bt_list_empty(&node_type_declarator->u.type_declarator.pointers)) { GQuark alias_q; /* @@ -434,11 +478,11 @@ struct declaration *ctf_type_declarator_visit(FILE *fd, int depth, } /* create array/sequence, pass nested_declaration as child. */ - if (cds_list_empty(&node_type_declarator->u.type_declarator.u.nested.length)) { + if (bt_list_empty(&node_type_declarator->u.type_declarator.u.nested.length)) { fprintf(fd, "[error] %s: expecting length field reference or value.\n", __func__); return NULL; } - first = _cds_list_first_entry(&node_type_declarator->u.type_declarator.u.nested.length, + first = _bt_list_first_entry(&node_type_declarator->u.type_declarator.u.nested.length, struct ctf_node, siblings); assert(first->type == NODE_UNARY_EXPRESSION); @@ -490,14 +534,14 @@ static int ctf_struct_type_declarators_visit(FILE *fd, int depth, struct declaration_struct *struct_declaration, struct ctf_node *type_specifier_list, - struct cds_list_head *type_declarators, + struct bt_list_head *type_declarators, struct declaration_scope *declaration_scope, struct ctf_trace *trace) { struct ctf_node *iter; GQuark field_name; - cds_list_for_each_entry(iter, type_declarators, siblings) { + bt_list_for_each_entry(iter, type_declarators, siblings) { struct declaration *field_declaration; field_declaration = ctf_type_declarator_visit(fd, depth, @@ -527,14 +571,14 @@ static int ctf_variant_type_declarators_visit(FILE *fd, int depth, struct declaration_untagged_variant *untagged_variant_declaration, struct ctf_node *type_specifier_list, - struct cds_list_head *type_declarators, + struct bt_list_head *type_declarators, struct declaration_scope *declaration_scope, struct ctf_trace *trace) { struct ctf_node *iter; GQuark field_name; - cds_list_for_each_entry(iter, type_declarators, siblings) { + bt_list_for_each_entry(iter, type_declarators, siblings) { struct declaration *field_declaration; field_declaration = ctf_type_declarator_visit(fd, depth, @@ -563,13 +607,13 @@ int ctf_variant_type_declarators_visit(FILE *fd, int depth, static int ctf_typedef_visit(FILE *fd, int depth, struct declaration_scope *scope, struct ctf_node *type_specifier_list, - struct cds_list_head *type_declarators, + struct bt_list_head *type_declarators, struct ctf_trace *trace) { struct ctf_node *iter; GQuark identifier; - cds_list_for_each_entry(iter, type_declarators, siblings) { + bt_list_for_each_entry(iter, type_declarators, siblings) { struct declaration *type_declaration; int ret; @@ -616,10 +660,10 @@ int ctf_typealias_visit(FILE *fd, int depth, struct declaration_scope *scope, * Create target type declaration. */ - if (cds_list_empty(&target->u.typealias_target.type_declarators)) + if (bt_list_empty(&target->u.typealias_target.type_declarators)) node = NULL; else - node = _cds_list_first_entry(&target->u.typealias_target.type_declarators, + node = _bt_list_first_entry(&target->u.typealias_target.type_declarators, struct ctf_node, siblings); type_declaration = ctf_type_declarator_visit(fd, depth, target->u.typealias_target.type_specifier_list, @@ -652,7 +696,7 @@ int ctf_typealias_visit(FILE *fd, int depth, struct declaration_scope *scope, * Create alias identifier. */ - node = _cds_list_first_entry(&alias->u.typealias_alias.type_declarators, + node = _bt_list_first_entry(&alias->u.typealias_alias.type_declarators, struct ctf_node, siblings); alias_q = create_typealias_identifier(fd, depth, alias->u.typealias_alias.type_specifier_list, node); @@ -757,8 +801,8 @@ int ctf_variant_declaration_list_visit(FILE *fd, int depth, static struct declaration *ctf_declaration_struct_visit(FILE *fd, - int depth, const char *name, struct cds_list_head *declaration_list, - int has_body, struct cds_list_head *min_align, + int depth, const char *name, struct bt_list_head *declaration_list, + int has_body, struct bt_list_head *min_align, struct declaration_scope *declaration_scope, struct ctf_trace *trace) { @@ -790,7 +834,7 @@ struct declaration *ctf_declaration_struct_visit(FILE *fd, return NULL; } } - if (!cds_list_empty(min_align)) { + if (!bt_list_empty(min_align)) { ret = get_unary_unsigned(min_align, &min_align_value); if (ret) { fprintf(fd, "[error] %s: unexpected unary expression for structure \"align\" attribute\n", __func__); @@ -800,7 +844,7 @@ struct declaration *ctf_declaration_struct_visit(FILE *fd, } struct_declaration = struct_declaration_new(declaration_scope, min_align_value); - cds_list_for_each_entry(iter, declaration_list, siblings) { + bt_list_for_each_entry(iter, declaration_list, siblings) { ret = ctf_struct_declaration_list_visit(fd, depth + 1, iter, struct_declaration, trace); if (ret) @@ -823,7 +867,7 @@ error: static struct declaration *ctf_declaration_variant_visit(FILE *fd, int depth, const char *name, const char *choice, - struct cds_list_head *declaration_list, + struct bt_list_head *declaration_list, int has_body, struct declaration_scope *declaration_scope, struct ctf_trace *trace) { @@ -854,7 +898,7 @@ struct declaration *ctf_declaration_variant_visit(FILE *fd, } } untagged_variant_declaration = untagged_variant_declaration_new(declaration_scope); - cds_list_for_each_entry(iter, declaration_list, siblings) { + bt_list_for_each_entry(iter, declaration_list, siblings) { ret = ctf_variant_declaration_list_visit(fd, depth + 1, iter, untagged_variant_declaration, trace); if (ret) @@ -898,7 +942,7 @@ int ctf_enumerator_list_visit(FILE *fd, int depth, int64_t start, end; int nr_vals = 0; - cds_list_for_each_entry(iter, &enumerator->u.enumerator.values, siblings) { + bt_list_for_each_entry(iter, &enumerator->u.enumerator.values, siblings) { int64_t *target; assert(iter->type == NODE_UNARY_EXPRESSION); @@ -931,7 +975,7 @@ int ctf_enumerator_list_visit(FILE *fd, int depth, uint64_t start, end; int nr_vals = 0; - cds_list_for_each_entry(iter, &enumerator->u.enumerator.values, siblings) { + bt_list_for_each_entry(iter, &enumerator->u.enumerator.values, siblings) { uint64_t *target; assert(iter->type == NODE_UNARY_EXPRESSION); @@ -972,7 +1016,7 @@ static struct declaration *ctf_declaration_enum_visit(FILE *fd, int depth, const char *name, struct ctf_node *container_type, - struct cds_list_head *enumerator_list, + struct bt_list_head *enumerator_list, int has_body, struct declaration_scope *declaration_scope, struct ctf_trace *trace) @@ -1031,7 +1075,7 @@ struct declaration *ctf_declaration_enum_visit(FILE *fd, int depth, integer_declaration = container_of(declaration, struct declaration_integer, p); enum_declaration = enum_declaration_new(integer_declaration); declaration_unref(&integer_declaration->p); /* leave ref to enum */ - cds_list_for_each_entry(iter, enumerator_list, siblings) { + bt_list_for_each_entry(iter, enumerator_list, siblings) { ret = ctf_enumerator_list_visit(fd, depth + 1, iter, enum_declaration); if (ret) goto error; @@ -1167,7 +1211,7 @@ int get_byte_order(FILE *fd, int depth, struct ctf_node *unary_expression, static struct declaration *ctf_declaration_integer_visit(FILE *fd, int depth, - struct cds_list_head *expressions, + struct bt_list_head *expressions, struct ctf_trace *trace) { struct ctf_node *expression; @@ -1180,11 +1224,11 @@ struct declaration *ctf_declaration_integer_visit(FILE *fd, int depth, struct ctf_clock *clock = NULL; struct declaration_integer *integer_declaration; - cds_list_for_each_entry(expression, expressions, siblings) { + bt_list_for_each_entry(expression, expressions, siblings) { struct ctf_node *left, *right; - left = _cds_list_first_entry(&expression->u.ctf_expression.left, struct ctf_node, siblings); - right = _cds_list_first_entry(&expression->u.ctf_expression.right, struct ctf_node, siblings); + left = _bt_list_first_entry(&expression->u.ctf_expression.left, struct ctf_node, siblings); + right = _bt_list_first_entry(&expression->u.ctf_expression.right, struct ctf_node, siblings); assert(left->u.unary_expression.type == UNARY_STRING); if (!strcmp(left->u.unary_expression.u.string, "signed")) { signedness = get_boolean(fd, depth, right); @@ -1353,7 +1397,7 @@ struct declaration *ctf_declaration_integer_visit(FILE *fd, int depth, static struct declaration *ctf_declaration_floating_point_visit(FILE *fd, int depth, - struct cds_list_head *expressions, + struct bt_list_head *expressions, struct ctf_trace *trace) { struct ctf_node *expression; @@ -1362,11 +1406,11 @@ struct declaration *ctf_declaration_floating_point_visit(FILE *fd, int depth, int has_alignment = 0, has_exp_dig = 0, has_mant_dig = 0; struct declaration_float *float_declaration; - cds_list_for_each_entry(expression, expressions, siblings) { + bt_list_for_each_entry(expression, expressions, siblings) { struct ctf_node *left, *right; - left = _cds_list_first_entry(&expression->u.ctf_expression.left, struct ctf_node, siblings); - right = _cds_list_first_entry(&expression->u.ctf_expression.right, struct ctf_node, siblings); + left = _bt_list_first_entry(&expression->u.ctf_expression.left, struct ctf_node, siblings); + right = _bt_list_first_entry(&expression->u.ctf_expression.right, struct ctf_node, siblings); assert(left->u.unary_expression.type == UNARY_STRING); if (!strcmp(left->u.unary_expression.u.string, "byte_order")) { byte_order = get_byte_order(fd, depth, right, trace); @@ -1432,7 +1476,7 @@ struct declaration *ctf_declaration_floating_point_visit(FILE *fd, int depth, static struct declaration *ctf_declaration_string_visit(FILE *fd, int depth, - struct cds_list_head *expressions, + struct bt_list_head *expressions, struct ctf_trace *trace) { struct ctf_node *expression; @@ -1440,11 +1484,11 @@ struct declaration *ctf_declaration_string_visit(FILE *fd, int depth, enum ctf_string_encoding encoding = CTF_STRING_UTF8; struct declaration_string *string_declaration; - cds_list_for_each_entry(expression, expressions, siblings) { + bt_list_for_each_entry(expression, expressions, siblings) { struct ctf_node *left, *right; - left = _cds_list_first_entry(&expression->u.ctf_expression.left, struct ctf_node, siblings); - right = _cds_list_first_entry(&expression->u.ctf_expression.right, struct ctf_node, siblings); + left = _bt_list_first_entry(&expression->u.ctf_expression.left, struct ctf_node, siblings); + right = _bt_list_first_entry(&expression->u.ctf_expression.right, struct ctf_node, siblings); assert(left->u.unary_expression.type == UNARY_STRING); if (!strcmp(left->u.unary_expression.u.string, "encoding")) { if (right->u.unary_expression.type != UNARY_STRING) { @@ -1477,7 +1521,7 @@ struct declaration *ctf_type_specifier_list_visit(FILE *fd, assert(type_specifier_list->type == NODE_TYPE_SPECIFIER_LIST); - first = _cds_list_first_entry(&type_specifier_list->u.type_specifier_list.head, struct ctf_node, siblings); + first = _bt_list_first_entry(&type_specifier_list->u.type_specifier_list.head, struct ctf_node, siblings); assert(first->type == NODE_TYPE_SPECIFIER); @@ -1541,7 +1585,7 @@ struct declaration *ctf_type_specifier_list_visit(FILE *fd, } static -int ctf_event_declaration_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_event *event, struct ctf_trace *trace) +int ctf_event_declaration_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_event_declaration *event, struct ctf_trace *trace) { int ret = 0; @@ -1626,7 +1670,7 @@ int ctf_event_declaration_visit(FILE *fd, int depth, struct ctf_node *node, stru goto error; } declaration = ctf_type_specifier_list_visit(fd, depth, - _cds_list_first_entry(&node->u.ctf_expression.right, + _bt_list_first_entry(&node->u.ctf_expression.right, struct ctf_node, siblings), event->declaration_scope, trace); if (!declaration) { @@ -1647,7 +1691,7 @@ int ctf_event_declaration_visit(FILE *fd, int depth, struct ctf_node *node, stru goto error; } declaration = ctf_type_specifier_list_visit(fd, depth, - _cds_list_first_entry(&node->u.ctf_expression.right, + _bt_list_first_entry(&node->u.ctf_expression.right, struct ctf_node, siblings), event->declaration_scope, trace); if (!declaration) { @@ -1697,12 +1741,12 @@ int ctf_event_visit(FILE *fd, int depth, struct ctf_node *node, { int ret = 0; struct ctf_node *iter; - struct ctf_event *event; + struct ctf_event_declaration *event; - event = g_new0(struct ctf_event, 1); + event = g_new0(struct ctf_event_declaration, 1); event->declaration_scope = new_declaration_scope(parent_declaration_scope); event->loglevel = -1; - cds_list_for_each_entry(iter, &node->u.event.declaration_list, siblings) { + bt_list_for_each_entry(iter, &node->u.event.declaration_list, siblings) { ret = ctf_event_declaration_visit(fd, depth + 1, iter, event, trace); if (ret) goto error; @@ -1757,7 +1801,7 @@ error: static -int ctf_stream_declaration_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_stream_class *stream, struct ctf_trace *trace) +int ctf_stream_declaration_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_stream_declaration *stream, struct ctf_trace *trace) { int ret = 0; @@ -1806,7 +1850,7 @@ int ctf_stream_declaration_visit(FILE *fd, int depth, struct ctf_node *node, str goto error; } declaration = ctf_type_specifier_list_visit(fd, depth, - _cds_list_first_entry(&node->u.ctf_expression.right, + _bt_list_first_entry(&node->u.ctf_expression.right, struct ctf_node, siblings), stream->declaration_scope, trace); if (!declaration) { @@ -1827,7 +1871,7 @@ int ctf_stream_declaration_visit(FILE *fd, int depth, struct ctf_node *node, str goto error; } declaration = ctf_type_specifier_list_visit(fd, depth, - _cds_list_first_entry(&node->u.ctf_expression.right, + _bt_list_first_entry(&node->u.ctf_expression.right, struct ctf_node, siblings), stream->declaration_scope, trace); if (!declaration) { @@ -1848,7 +1892,7 @@ int ctf_stream_declaration_visit(FILE *fd, int depth, struct ctf_node *node, str goto error; } declaration = ctf_type_specifier_list_visit(fd, depth, - _cds_list_first_entry(&node->u.ctf_expression.right, + _bt_list_first_entry(&node->u.ctf_expression.right, struct ctf_node, siblings), stream->declaration_scope, trace); if (!declaration) { @@ -1883,15 +1927,15 @@ int ctf_stream_visit(FILE *fd, int depth, struct ctf_node *node, { int ret = 0; struct ctf_node *iter; - struct ctf_stream_class *stream; + struct ctf_stream_declaration *stream; - stream = g_new0(struct ctf_stream_class, 1); + stream = g_new0(struct ctf_stream_declaration, 1); stream->declaration_scope = new_declaration_scope(parent_declaration_scope); stream->events_by_id = g_ptr_array_new(); stream->event_quark_to_id = g_hash_table_new(g_direct_hash, g_direct_equal); stream->streams = g_ptr_array_new(); if (node) { - cds_list_for_each_entry(iter, &node->u.stream.declaration_list, siblings) { + bt_list_for_each_entry(iter, &node->u.stream.declaration_list, siblings) { ret = ctf_stream_declaration_visit(fd, depth + 1, iter, stream, trace); if (ret) goto error; @@ -1991,16 +2035,16 @@ int ctf_trace_declaration_visit(FILE *fd, int depth, struct ctf_node *node, stru } CTF_TRACE_SET_FIELD(trace, minor); } else if (!strcmp(left, "uuid")) { - uuid_t uuid; + unsigned char uuid[BABELTRACE_UUID_LEN]; - ret = get_unary_uuid(&node->u.ctf_expression.right, &uuid); + ret = get_unary_uuid(&node->u.ctf_expression.right, uuid); if (ret) { fprintf(fd, "[error] %s: unexpected unary expression for trace uuid\n", __func__); ret = -EINVAL; goto error; } if (CTF_TRACE_FIELD_IS_SET(trace, uuid) - && uuid_compare(uuid, trace->uuid)) { + && babeltrace_uuid_compare(uuid, trace->uuid)) { fprintf(fd, "[error] %s: uuid mismatch\n", __func__); ret = -EPERM; goto error; @@ -2012,7 +2056,7 @@ int ctf_trace_declaration_visit(FILE *fd, int depth, struct ctf_node *node, stru struct ctf_node *right; int byte_order; - right = _cds_list_first_entry(&node->u.ctf_expression.right, struct ctf_node, siblings); + right = _bt_list_first_entry(&node->u.ctf_expression.right, struct ctf_node, siblings); byte_order = get_trace_byte_order(fd, depth, right); if (byte_order < 0) return -EINVAL; @@ -2046,7 +2090,7 @@ int ctf_trace_declaration_visit(FILE *fd, int depth, struct ctf_node *node, stru goto error; } declaration = ctf_type_specifier_list_visit(fd, depth, - _cds_list_first_entry(&node->u.ctf_expression.right, + _bt_list_first_entry(&node->u.ctf_expression.right, struct ctf_node, siblings), trace->declaration_scope, trace); if (!declaration) { @@ -2084,7 +2128,7 @@ int ctf_trace_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace return -EEXIST; trace->declaration_scope = new_declaration_scope(trace->root_declaration_scope); trace->streams = g_ptr_array_new(); - cds_list_for_each_entry(iter, &node->u.trace.declaration_list, siblings) { + bt_list_for_each_entry(iter, &node->u.trace.declaration_list, siblings) { ret = ctf_trace_declaration_visit(fd, depth + 1, iter, trace); if (ret) goto error; @@ -2099,11 +2143,6 @@ int ctf_trace_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace fprintf(fd, "[error] %s: missing minor field in trace declaration\n", __func__); goto error; } - if (!CTF_TRACE_FIELD_IS_SET(trace, uuid)) { - ret = -EPERM; - fprintf(fd, "[error] %s: missing uuid field in trace declaration\n", __func__); - goto error; - } if (!CTF_TRACE_FIELD_IS_SET(trace, byte_order)) { ret = -EPERM; fprintf(fd, "[error] %s: missing byte_order field in trace declaration\n", __func__); @@ -2242,7 +2281,7 @@ int ctf_clock_declaration_visit(FILE *fd, int depth, struct ctf_node *node, } else if (!strcmp(left, "absolute")) { struct ctf_node *right; - right = _cds_list_first_entry(&node->u.ctf_expression.right, struct ctf_node, siblings); + right = _bt_list_first_entry(&node->u.ctf_expression.right, struct ctf_node, siblings); ret = get_boolean(fd, depth, right); if (ret < 0) { fprintf(fd, "[error] %s: unexpected \"absolute\" right member\n", __func__); @@ -2276,18 +2315,29 @@ int ctf_clock_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace clock = g_new0(struct ctf_clock, 1); /* Default clock frequency is set to 1000000000 */ clock->freq = 1000000000ULL; - cds_list_for_each_entry(iter, &node->u.clock.declaration_list, siblings) { + bt_list_for_each_entry(iter, &node->u.clock.declaration_list, siblings) { ret = ctf_clock_declaration_visit(fd, depth + 1, iter, clock, trace); if (ret) goto error; } + if (opt_clock_force_correlate) { + /* + * User requested to forcibly correlate the clock + * sources, even if we have no correlatation + * information. + */ + if (!clock->absolute) { + fprintf(fd, "[warning] Forcibly correlating trace clock sources (--clock-force-correlate).\n"); + } + clock->absolute = 1; + } if (!CTF_CLOCK_FIELD_IS_SET(clock, name)) { ret = -EPERM; fprintf(fd, "[error] %s: missing namefield in clock declaration\n", __func__); goto error; } if (g_hash_table_size(trace->clocks) > 0) { - fprintf(stderr, "[error] Only CTF traces with a single clock description are supported by this babeltrace version.\n"); + fprintf(fd, "[error] Only CTF traces with a single clock description are supported by this babeltrace version.\n"); ret = -EINVAL; goto error; } @@ -2301,6 +2351,35 @@ error: return ret; } +static +void ctf_clock_default(FILE *fd, int depth, struct ctf_trace *trace) +{ + struct ctf_clock *clock; + + clock = g_new0(struct ctf_clock, 1); + clock->name = g_quark_from_string("monotonic"); + clock->uuid = 0; + clock->description = g_strdup("Default clock"); + /* Default clock frequency is set to 1000000000 */ + clock->freq = 1000000000ULL; + if (opt_clock_force_correlate) { + /* + * User requested to forcibly correlate the clock + * sources, even if we have no correlatation + * information. + */ + if (!clock->absolute) { + fprintf(fd, "[warning] Forcibly correlating trace clock sources (--clock-force-correlate).\n"); + } + clock->absolute = 1; + } else { + clock->absolute = 0; /* Not an absolute reference across traces */ + } + + trace->single_clock = clock; + g_hash_table_insert(trace->clocks, (gpointer) (unsigned long) clock->name, clock); +} + static void clock_free(gpointer data) { @@ -2351,7 +2430,7 @@ int ctf_env_declaration_visit(FILE *fd, int depth, struct ctf_node *node, } strncpy(env->procname, right, TRACER_ENV_LEN); env->procname[TRACER_ENV_LEN - 1] = '\0'; - printf_verbose("env.procname = %s\n", env->procname); + printf_verbose("env.procname = \"%s\"\n", env->procname); } else if (!strcmp(left, "domain")) { char *right; @@ -2366,7 +2445,7 @@ int ctf_env_declaration_visit(FILE *fd, int depth, struct ctf_node *node, } strncpy(env->domain, right, TRACER_ENV_LEN); env->domain[TRACER_ENV_LEN - 1] = '\0'; - printf_verbose("env.domain = %s\n", env->domain); + printf_verbose("env.domain = \"%s\"\n", env->domain); } else if (!strcmp(left, "sysname")) { char *right; @@ -2381,8 +2460,8 @@ int ctf_env_declaration_visit(FILE *fd, int depth, struct ctf_node *node, } strncpy(env->sysname, right, TRACER_ENV_LEN); env->sysname[TRACER_ENV_LEN - 1] = '\0'; - printf_verbose("env.sysname = %s\n", env->sysname); - } else if (!strcmp(left, "release")) { + printf_verbose("env.sysname = \"%s\"\n", env->sysname); + } else if (!strcmp(left, "kernel_release")) { char *right; if (env->release[0]) { @@ -2396,8 +2475,8 @@ int ctf_env_declaration_visit(FILE *fd, int depth, struct ctf_node *node, } strncpy(env->release, right, TRACER_ENV_LEN); env->release[TRACER_ENV_LEN - 1] = '\0'; - printf_verbose("env.release = %s\n", env->release); - } else if (!strcmp(left, "version")) { + printf_verbose("env.release = \"%s\"\n", env->release); + } else if (!strcmp(left, "kernel_version")) { char *right; if (env->version[0]) { @@ -2411,9 +2490,30 @@ int ctf_env_declaration_visit(FILE *fd, int depth, struct ctf_node *node, } strncpy(env->version, right, TRACER_ENV_LEN); env->version[TRACER_ENV_LEN - 1] = '\0'; - printf_verbose("env.version = %s\n", env->version); + printf_verbose("env.version = \"%s\"\n", env->version); } else { - printf_verbose("%s: attribute \"%s\" is unknown in environment declaration.\n", __func__, left); + if (is_unary_string(&node->u.ctf_expression.right)) { + char *right; + + right = concatenate_unary_strings(&node->u.ctf_expression.right); + printf_verbose("env.%s = \"%s\"\n", left, right); + } else if (is_unary_unsigned(&node->u.ctf_expression.right)) { + uint64_t v; + int ret; + + ret = get_unary_unsigned(&node->u.ctf_expression.right, &v); + assert(ret == 0); + printf_verbose("env.%s = %" PRIu64 "\n", left, v); + } else if (is_unary_signed(&node->u.ctf_expression.right)) { + int64_t v; + int ret; + + ret = get_unary_signed(&node->u.ctf_expression.right, &v); + assert(ret == 0); + printf_verbose("env.%s = %" PRId64 "\n", left, v); + } else { + printf_verbose("%s: attribute \"%s\" has unknown type.\n", __func__, left); + } } error: @@ -2439,7 +2539,7 @@ int ctf_env_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace * trace->env.sysname[0] = '\0'; trace->env.release[0] = '\0'; trace->env.version[0] = '\0'; - cds_list_for_each_entry(iter, &node->u.env.declaration_list, siblings) { + bt_list_for_each_entry(iter, &node->u.env.declaration_list, siblings) { ret = ctf_env_declaration_visit(fd, depth + 1, iter, trace); if (ret) goto error; @@ -2516,17 +2616,21 @@ retry: * declarations need to query clock hash table, * so clock need to be treated first. */ - cds_list_for_each_entry(iter, &node->u.root.clock, siblings) { - ret = ctf_clock_visit(fd, depth + 1, iter, - trace); - if (ret) { - fprintf(fd, "[error] %s: clock declaration error\n", __func__); - goto error; + if (bt_list_empty(&node->u.root.clock)) { + ctf_clock_default(fd, depth + 1, trace); + } else { + bt_list_for_each_entry(iter, &node->u.root.clock, siblings) { + ret = ctf_clock_visit(fd, depth + 1, iter, + trace); + if (ret) { + fprintf(fd, "[error] %s: clock declaration error\n", __func__); + goto error; + } } } env_clock_done = 1; } - cds_list_for_each_entry(iter, &node->u.root.declaration_list, + bt_list_for_each_entry(iter, &node->u.root.declaration_list, siblings) { ret = ctf_root_declaration_visit(fd, depth + 1, iter, trace); if (ret) { @@ -2534,7 +2638,7 @@ retry: goto error; } } - cds_list_for_each_entry(iter, &node->u.root.trace, siblings) { + bt_list_for_each_entry(iter, &node->u.root.trace, siblings) { ret = ctf_trace_visit(fd, depth + 1, iter, trace); if (ret == -EINTR) { free_declaration_scope(trace->root_declaration_scope); @@ -2555,14 +2659,14 @@ retry: ret = -EINVAL; goto error; } - cds_list_for_each_entry(iter, &node->u.root.env, siblings) { + bt_list_for_each_entry(iter, &node->u.root.env, siblings) { ret = ctf_env_visit(fd, depth + 1, iter, trace); if (ret) { fprintf(fd, "[error] %s: env declaration error\n", __func__); goto error; } } - cds_list_for_each_entry(iter, &node->u.root.stream, siblings) { + bt_list_for_each_entry(iter, &node->u.root.stream, siblings) { ret = ctf_stream_visit(fd, depth + 1, iter, trace->root_declaration_scope, trace); if (ret) { @@ -2570,7 +2674,7 @@ retry: goto error; } } - cds_list_for_each_entry(iter, &node->u.root.event, siblings) { + bt_list_for_each_entry(iter, &node->u.root.event, siblings) { ret = ctf_event_visit(fd, depth + 1, iter, trace->root_declaration_scope, trace); if (ret) {