declaration = &array_declaration->p;
break;
}
- case NODE_INTEGER:
- case NODE_TYPE_SPECIFIER:
+ case NODE_TYPE_SPECIFIER_LIST:
{
struct declaration_sequence *sequence_declaration;
struct declaration_integer *integer_declaration;
- GQuark dummy_id;
- declaration = ctf_type_declarator_visit(fd, depth,
- length,
- &dummy_id, NULL,
- declaration_scope,
- NULL, trace);
- assert(declaration->id == CTF_TYPE_INTEGER);
+ declaration = ctf_type_specifier_list_visit(fd, depth,
+ length, declaration_scope, trace);
+ if (!declaration) {
+ fprintf(fd, "[error] %s: unable to find declaration type for sequence length\n", __func__);
+ return NULL;
+ }
+ if (declaration->id != CTF_TYPE_INTEGER) {
+ fprintf(fd, "[error] %s: length type for sequence is expected to be an integer (unsigned).\n", __func__);
+ declaration_unref(declaration);
+ return NULL;
+ }
integer_declaration = container_of(declaration, struct declaration_integer, p);
+ if (integer_declaration->signedness != false) {
+ fprintf(fd, "[error] %s: length type for sequence should always be an unsigned integer.\n", __func__);
+ declaration_unref(declaration);
+ return NULL;
+ }
+
sequence_declaration = sequence_declaration_new(integer_declaration,
nested_declaration, declaration_scope);
declaration = &sequence_declaration->p;
&field_name, iter,
struct_declaration->scope,
NULL, trace);
+ if (!field_declaration) {
+ fprintf(fd, "[error] %s: unable to find struct field declaration type\n", __func__);
+ return -EINVAL;
+ }
struct_declaration_add_field(struct_declaration,
g_quark_to_string(field_name),
field_declaration);
&field_name, iter,
untagged_variant_declaration->scope,
NULL, trace);
+ if (!field_declaration) {
+ fprintf(fd, "[error] %s: unable to find variant field declaration type\n", __func__);
+ return -EINVAL;
+ }
untagged_variant_declaration_add_field(untagged_variant_declaration,
g_quark_to_string(field_name),
field_declaration);
type_specifier_list,
&identifier, iter,
scope, NULL, trace);
+ if (!type_declaration) {
+ fprintf(fd, "[error] %s: problem creating type declaration\n", __func__);
+ return -EINVAL;
+ }
+ /*
+ * Don't allow typedef and typealias of untagged
+ * variants.
+ */
+ if (type_declaration->id == CTF_TYPE_UNTAGGED_VARIANT) {
+ fprintf(fd, "[error] %s: typedef of untagged variant is not permitted.\n", __func__);
+ declaration_unref(type_declaration);
+ return -EPERM;
+ }
ret = register_declaration(identifier, type_declaration, scope);
if (ret) {
type_declaration->declaration_free(type_declaration);
* Create target type declaration.
*/
- if (cds_list_empty(&alias->u.typealias_target.type_declarators))
+ if (cds_list_empty(&target->u.typealias_target.type_declarators))
node = NULL;
else
- node = _cds_list_first_entry(&alias->u.typealias_target.type_declarators,
+ node = _cds_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,
err = -EINVAL;
goto error;
}
+ /*
+ * Don't allow typedef and typealias of untagged
+ * variants.
+ */
+ if (type_declaration->id == CTF_TYPE_UNTAGGED_VARIANT) {
+ fprintf(fd, "[error] %s: typedef of untagged variant is not permitted.\n", __func__);
+ declaration_unref(type_declaration);
+ return -EPERM;
+ }
/*
* The semantic validator does not check whether the target is
* abstract or not (if it has an identifier). Check it here.
return &variant_declaration->p;
}
error:
- untagged_variant_declaration->p.declaration_free(&variant_declaration->p);
+ untagged_variant_declaration->p.declaration_free(&untagged_variant_declaration->p);
return NULL;
}
}
}
if (!container_type) {
- fprintf(fd, "[error] %s: missing container type for enumeration\n", __func__);
+ declaration = lookup_declaration(g_quark_from_static_string("int"),
+ declaration_scope);
+ if (!declaration) {
+ fprintf(fd, "[error] %s: \"int\" type declaration missing for enumeration\n", __func__);
return NULL;
-
- }
- switch (container_type->type) {
- case NODE_INTEGER:
- case NODE_TYPE_SPECIFIER:
+ }
+ } else {
declaration = ctf_type_declarator_visit(fd, depth,
container_type,
&dummy_id, NULL,
declaration_scope,
NULL, trace);
- assert(declaration->id == CTF_TYPE_INTEGER);
- integer_declaration = container_of(declaration, struct declaration_integer, p);
- break;
- default:
- assert(0);
}
+ if (!declaration) {
+ fprintf(fd, "[error] %s: unable to create container type for enumeration\n", __func__);
+ return NULL;
+ }
+ if (declaration->id != CTF_TYPE_INTEGER) {
+ fprintf(fd, "[error] %s: container type for enumeration is not integer\n", __func__);
+ return NULL;
+ }
+ 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) {
struct ctf_node *first;
struct ctf_node *node;
+ 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);
assert(first->type == NODE_TYPE_SPECIFIER);
&node->u.integer.expressions, trace);
case TYPESPEC_STRING:
return ctf_declaration_string_visit(fd, depth,
- &first->u.string.expressions, trace);
+ &node->u.string.expressions, trace);
case TYPESPEC_STRUCT:
return ctf_declaration_struct_visit(fd, depth,
node->u._struct.name,
if (!strcmp(left, "name")) {
char *right;
- if (CTF_EVENT_FIELD_IS_SET(event, name))
+ if (CTF_EVENT_FIELD_IS_SET(event, name)) {
+ fprintf(fd, "[error] %s: name already declared in event declaration\n", __func__);
return -EPERM;
+ }
right = concatenate_unary_strings(&node->u.ctf_expression.right);
if (!right) {
fprintf(fd, "[error] %s: unexpected unary expression for event name\n", __func__);
g_free(right);
CTF_EVENT_SET_FIELD(event, name);
} else if (!strcmp(left, "id")) {
- if (CTF_EVENT_FIELD_IS_SET(event, id))
+ if (CTF_EVENT_FIELD_IS_SET(event, id)) {
+ fprintf(fd, "[error] %s: id already declared in event declaration\n", __func__);
return -EPERM;
+ }
ret = get_unary_unsigned(&node->u.ctf_expression.right, &event->id);
if (ret) {
fprintf(fd, "[error] %s: unexpected unary expression for event id\n", __func__);
}
CTF_EVENT_SET_FIELD(event, id);
} else if (!strcmp(left, "stream_id")) {
- if (CTF_EVENT_FIELD_IS_SET(event, stream_id))
+ if (CTF_EVENT_FIELD_IS_SET(event, stream_id)) {
+ fprintf(fd, "[error] %s: stream_id already declared in event declaration\n", __func__);
return -EPERM;
+ }
ret = get_unary_unsigned(&node->u.ctf_expression.right, &event->stream_id);
if (ret) {
fprintf(fd, "[error] %s: unexpected unary expression for event stream_id\n", __func__);
} else if (!strcmp(left, "context")) {
struct declaration *declaration;
+ if (event->context_decl) {
+ fprintf(fd, "[error] %s: context already declared in event declaration\n", __func__);
+ return -EINVAL;
+ }
declaration = ctf_type_specifier_list_visit(fd, depth,
_cds_list_first_entry(&node->u.ctf_expression.right,
struct ctf_node, siblings),
} else if (!strcmp(left, "fields")) {
struct declaration *declaration;
+ if (event->fields_decl) {
+ fprintf(fd, "[error] %s: fields already declared in event declaration\n", __func__);
+ return -EINVAL;
+ }
declaration = ctf_type_specifier_list_visit(fd, depth,
_cds_list_first_entry(&node->u.ctf_expression.right,
struct ctf_node, siblings),
}
if (!CTF_EVENT_FIELD_IS_SET(event, name)) {
ret = -EPERM;
+ fprintf(fd, "[error] %s: missing name field in event declaration\n", __func__);
goto error;
}
if (!CTF_EVENT_FIELD_IS_SET(event, id)) {
ret = -EPERM;
+ fprintf(fd, "[error] %s: missing id field in event declaration\n", __func__);
goto error;
}
if (!CTF_EVENT_FIELD_IS_SET(event, stream_id)) {
ret = -EPERM;
+ fprintf(fd, "[error] %s: missing stream_id field in event declaration\n", __func__);
goto error;
}
if (event->stream->events_by_id->len <= event->id)
char *left;
left = concatenate_unary_strings(&node->u.ctf_expression.left);
- if (!strcmp(left, "stream_id")) {
- if (CTF_STREAM_FIELD_IS_SET(stream, stream_id))
+ if (!strcmp(left, "id")) {
+ if (CTF_STREAM_FIELD_IS_SET(stream, stream_id)) {
+ fprintf(fd, "[error] %s: id already declared in stream declaration\n", __func__);
return -EPERM;
+ }
ret = get_unary_unsigned(&node->u.ctf_expression.right, &stream->stream_id);
if (ret) {
- fprintf(fd, "[error] %s: unexpected unary expression for event stream_id\n", __func__);
+ fprintf(fd, "[error] %s: unexpected unary expression for stream id\n", __func__);
return -EINVAL;
}
CTF_STREAM_SET_FIELD(stream, stream_id);
} else if (!strcmp(left, "event.header")) {
struct declaration *declaration;
+ if (stream->event_header_decl) {
+ fprintf(fd, "[error] %s: event.header already declared in stream declaration\n", __func__);
+ return -EINVAL;
+ }
declaration = ctf_type_specifier_list_visit(fd, depth,
_cds_list_first_entry(&node->u.ctf_expression.right,
struct ctf_node, siblings),
} else if (!strcmp(left, "event.context")) {
struct declaration *declaration;
+ if (stream->event_context_decl) {
+ fprintf(fd, "[error] %s: event.context already declared in stream declaration\n", __func__);
+ return -EINVAL;
+ }
declaration = ctf_type_specifier_list_visit(fd, depth,
_cds_list_first_entry(&node->u.ctf_expression.right,
struct ctf_node, siblings),
} else if (!strcmp(left, "packet.context")) {
struct declaration *declaration;
+ if (stream->packet_context_decl) {
+ fprintf(fd, "[error] %s: packet.context already declared in stream declaration\n", __func__);
+ return -EINVAL;
+ }
declaration = ctf_type_specifier_list_visit(fd, depth,
_cds_list_first_entry(&node->u.ctf_expression.right,
struct ctf_node, siblings),
stream = g_new0(struct ctf_stream, 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_int_hash, g_int_equal);
+ stream->event_quark_to_id = g_hash_table_new(g_direct_hash, g_direct_equal);
cds_list_for_each_entry(iter, &node->u.stream.declaration_list, siblings) {
ret = ctf_stream_declaration_visit(fd, depth + 1, iter, stream, trace);
if (ret)
}
if (!CTF_STREAM_FIELD_IS_SET(stream, stream_id)) {
ret = -EPERM;
+ fprintf(fd, "[error] %s: missing id field in stream declaration\n", __func__);
goto error;
}
if (trace->streams->len <= stream->stream_id)
left = concatenate_unary_strings(&node->u.ctf_expression.left);
if (!strcmp(left, "major")) {
- if (CTF_TRACE_FIELD_IS_SET(trace, major))
+ if (CTF_TRACE_FIELD_IS_SET(trace, major)) {
+ fprintf(fd, "[error] %s: major already declared in trace declaration\n", __func__);
return -EPERM;
+ }
ret = get_unary_unsigned(&node->u.ctf_expression.right, &trace->major);
if (ret) {
fprintf(fd, "[error] %s: unexpected unary expression for trace major number\n", __func__);
}
CTF_TRACE_SET_FIELD(trace, major);
} else if (!strcmp(left, "minor")) {
- if (CTF_TRACE_FIELD_IS_SET(trace, minor))
+ if (CTF_TRACE_FIELD_IS_SET(trace, minor)) {
+ fprintf(fd, "[error] %s: minor already declared in trace declaration\n", __func__);
return -EPERM;
+ }
ret = get_unary_unsigned(&node->u.ctf_expression.right, &trace->minor);
if (ret) {
fprintf(fd, "[error] %s: unexpected unary expression for trace minor number\n", __func__);
return -EINVAL;
}
CTF_TRACE_SET_FIELD(trace, minor);
- } else if (!strcmp(left, "word_size")) {
- if (CTF_TRACE_FIELD_IS_SET(trace, word_size))
- return -EPERM;
- ret = get_unary_unsigned(&node->u.ctf_expression.right, &trace->word_size);
- if (ret) {
- fprintf(fd, "[error] %s: unexpected unary expression for trace word_size\n", __func__);
- return -EINVAL;
- }
- CTF_TRACE_SET_FIELD(trace, word_size);
} else if (!strcmp(left, "uuid")) {
- if (CTF_TRACE_FIELD_IS_SET(trace, uuid))
+ if (CTF_TRACE_FIELD_IS_SET(trace, uuid)) {
+ fprintf(fd, "[error] %s: uuid already declared in trace declaration\n", __func__);
return -EPERM;
+ }
ret = get_unary_uuid(&node->u.ctf_expression.right, &trace->uuid);
if (ret) {
fprintf(fd, "[error] %s: unexpected unary expression for trace uuid\n", __func__);
}
if (!CTF_TRACE_FIELD_IS_SET(trace, major)) {
ret = -EPERM;
+ fprintf(fd, "[error] %s: missing major field in trace declaration\n", __func__);
goto error;
}
if (!CTF_TRACE_FIELD_IS_SET(trace, minor)) {
ret = -EPERM;
+ fprintf(fd, "[error] %s: missing minor field in trace declaration\n", __func__);
goto error;
}
if (!CTF_TRACE_FIELD_IS_SET(trace, uuid)) {
ret = -EPERM;
- goto error;
- }
- if (!CTF_TRACE_FIELD_IS_SET(trace, word_size)) {
- ret = -EPERM;
+ fprintf(fd, "[error] %s: missing uuid field in trace declaration\n", __func__);
goto error;
}
return 0;
cds_list_for_each_entry(iter, &node->u.root.declaration_list,
siblings) {
ret = ctf_root_declaration_visit(fd, depth + 1, iter, trace);
- if (ret)
+ if (ret) {
+ fprintf(fd, "[error] %s: root declaration error\n", __func__);
return ret;
+ }
}
cds_list_for_each_entry(iter, &node->u.root.trace, siblings) {
ret = ctf_trace_visit(fd, depth + 1, iter, trace);
- if (ret)
+ if (ret) {
+ fprintf(fd, "[error] %s: trace declaration error\n", __func__);
return ret;
+ }
+ }
+ if (!trace->streams) {
+ fprintf(fd, "[error] %s: missing trace declaration\n", __func__);
+ return -EINVAL;
}
cds_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)
+ if (ret) {
+ fprintf(fd, "[error] %s: stream declaration error\n", __func__);
return ret;
+ }
}
cds_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)
+ if (ret) {
+ fprintf(fd, "[error] %s: event declaration error\n", __func__);
return ret;
+ }
}
break;
case NODE_UNKNOWN:
projects / babeltrace.git / blobdiff