#include <inttypes.h>
#include <errno.h>
#include <babeltrace/list.h>
+#include <uuid/uuid.h>
#include "ctf-scanner.h"
#include "ctf-parser.h"
#include "ctf-ast.h"
fprintf(fd, "bool");
break;
case TYPESPEC_COMPLEX:
- fprintf(fd, "complex");
+ fprintf(fd, "_Complex");
+ break;
+ case TYPESPEC_IMAGINARY:
+ fprintf(fd, "_Imaginary");
break;
case TYPESPEC_CONST:
fprintf(fd, "const");
}
/*
- * String returned must be freed by the caller.
+ * String returned must be freed by the caller using g_free.
*/
static
char *concatenate_unary_strings(struct list_head *head)
{
-
+ struct ctf_node *node;
+ GString *str;
+ int i = 0;
+
+ str = g_string_new();
+ cds_list_for_each_entry(node, head, siblings) {
+ char *src_string;
+
+ assert(node->type == NODE_UNARY_EXPRESSION);
+ assert(node->u.unary_expression.type == UNARY_STRING);
+ assert((node->u.unary_expression.link == UNARY_LINK_UNKNOWN)
+ ^ (i != 0))
+ switch (node->u.unary_expression.link) {
+ case UNARY_DOTLINK:
+ g_string_append(str, ".")
+ break;
+ case UNARY_ARROWLINK:
+ g_string_append(str, "->")
+ break;
+ case UNARY_DOTDOTDOT:
+ g_string_append(str, "...")
+ break;
+ }
+ src_string = u.unary_expression.u.string;
+ g_string_append(str, src_string);
+ i++;
+ }
+ return g_string_free(str, FALSE);
}
static
int get_unary_unsigned(struct list_head *head, uint64_t *value)
{
-
+ struct ctf_node *node;
+ int i = 0;
+
+ cds_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);
+ assert(i == 0);
+ *value = node->u.unary_expression.unsigned_constant
+ i++;
+ }
+ return 0;
}
static
int get_unary_uuid(struct list_head *head, uuid_t *uuid)
{
-
+ struct ctf_node *node;
+ int i = 0;
+ int ret = -1;
+
+ cds_list_for_each_entry(node, head, siblings) {
+ const char *src_string;
+
+ assert(node->type == NODE_UNARY_EXPRESSION);
+ assert(node->u.unary_expression.type == UNARY_STRING);
+ assert(node->u.unary_expression.link == UNARY_LINK_UNKNOWN);
+ assert(i == 0);
+ src_string = u.unary_expression.u.string;
+ ret = uuid_parse(u.unary_expression.u.string, *uuid);
+ }
+ return ret;
}
static
}
/*
- * Also add named variant, struct or enum to the current type scope.
+ * Also add named variant, struct or enum to the current declaration scope.
*/
static
-struct ctf_type *ctf_type_specifier_visit(FILE *fd,
- int depth, struct list_head *head,
- struct type_scope *type_scope,
- struct definition_scope *definition_scope)
+struct ctf_declaration *ctf_declaration_specifier_visit(FILE *fd,
+ int depth, struct list_head *head,
+ struct declaration_scope *declaration_scope)
{
- struct ctf_type *type;
+ struct ctf_declaration *declaration;
struct node *first;
first = _cds_list_first_entry(head, struct node, siblings);
switch (first->type) {
case NODE_STRUCT:
- /* For named struct (without body), lookup in type scope */
- /* For named struct (with body), create type and add to type scope */
+ /*
+ * For named struct (without body), lookup in
+ * declaration scope and create declaration copy.
+ */
+ /* For named struct (with body), create type and add to declaration scope */
/* For unnamed struct, create type */
break;
case NODE_VARIANT:
- /* For named variant (without body), lookup in type scope */
- /* For named variant (with body), create type and add to type scope */
+ /*
+ * For named variant (without body), lookup in
+ * declaration scope and create declaration copy.
+ */
+ /* For named variant (with body), create type and add to declaration scope */
/* For unnamed variant, create type */
+ /* If variant has a tag field specifier, assign tag name. */
break;
case NODE_ENUM:
- /* For named enum (without body), lookup in type scope */
- /* For named enum (with body), create type and add to type scope */
+ /*
+ * For named enum (without body), lookup in declaration
+ * scope and create declaration copy.
+ */
+ /* For named enum (with body), create type and add to declaration scope */
/* For unnamed enum, create type */
+ /* Enumerations need to have their size/type specifier (< >). */
break;
case NODE_INTEGER:
+ /*
+ * Create an integer declaration.
+ */
break;
case NODE_FLOATING_POINT:
+ /*
+ * Create a floating point declaration.
+ */
+ break;
+ case NODE_STRING:
+ /*
+ * Create a string declaration.
+ */
break;
case NODE_TYPE_SPECIFIER:
+ /*
+ * Lookup named type in typedef declarations (in
+ * declaration scope). Create a copy of the declaration.
+ */
break;
}
}
-static
-struct ctf_declaration *ctf_declaration_specifier_visit(FILE *fd,
- int depth, struct list_head *head,
- struct type_scope *type_scope,
- struct definition_scope *definition_scope)
-{
- struct ctf_declaration *declaration;
- struct ctf_type *type;
-
- type = ctf_type_specifier_visit(fd, depth, head, type_scope,
- definition_scope);
- declaration = type->declaration_new(type, definition_scope);
- if (type->id == CTF_TYPE_VARIANT) {
- struct declaration_variant *variant =
- container_of(declaration, struct declaration_variant, p);
- struct declaration *enum_tag =
- lookup_field_declaration(enum_tag_name, definition_scope);
- if (!enum_tag) {
- fprintf(fd, "[error]: expected enumeration tag field %s for variant\n",
- enum_tag_name);
- goto error;
- }
- /* TODO find enum tag */
- ret = variant_declaration_set_tag(variant, enum_tag);
- }
- return declaration;
-error:
- declaration_unref(declaration);
- type_unref(type);
- return NULL;
-}
-
static
int ctf_typedef_declarator_visit(FILE *fd, int depth,
- struct list_head *declaration_specifier,
- struct node *type_declarator, struct type_scope *type_scope,
- struct definition_scope *definition_scope)
+ struct list_head *declaration_specifier,
+ struct node *type_declarator,
+ struct declaration_scope *declaration_scope)
{
/*
* Build the type using declaration specifier (creating
* declaration from type_specifier), then apply type declarator,
- * add the resulting type to the current type scope.
+ * add the resulting type to the current declaration scope.
*/
cds_list_for_each_entry(iter, declaration_specifier, siblings) {
static
int ctf_typedef_visit(FILE *fd, int depth,
- struct list_head *declaration_specifier,
- struct list_head *type_declarators,
- struct type_scope *type_scope,
- struct definition_scope *definition_scope)
+ struct list_head *declaration_specifier,
+ struct list_head *type_declarators,
+ struct declaration_scope *declaration_scope)
{
struct ctf_node *iter;
cds_list_for_each_entry(iter, type_declarators, siblings) {
ret = ctf_typedef_declarator_visit(fd, depth + 1,
&node->u._typedef.declaration_specifier, iter,
- type_scope, definition_scope);
+ declaration_scope);
if (ret)
return ret;
}
static
int ctf_typealias_visit(FILE *fd, int depth, struct ctf_node *target,
- struct ctf_node *alias, struct type_scope *type_scope,
- struct definition_scope *definition_scope)
+ struct ctf_node *alias,
+ struct declaration_scope *declaration_scope)
{
- /* Build target type, check that it is reachable in current type scope. */
+ /*
+ * Build target type, check that it is reachable in current
+ * declaration scope.
+ */
+
/* Only one type declarator is allowed */
- /* Build alias type, add to current type scope. */
+ /* Build alias type, add to current declaration scope. */
/* Only one type declarator is allowed */
}
ret = ctf_typedef_visit(fd, depth + 1,
&node->u._typedef.declaration_specifier,
&node->u._typedef.type_declarators,
- event->type_scope, event->definition_scope);
+ event->declaration_scope);
if (ret)
return ret;
break;
case NODE_TYPEALIAS:
ret = ctf_typealias_visit(fd, depth + 1,
&node->u.typealias.target, &node->u.typealias.alias
- event->type_scope, event->definition_scope);
+ event->declaration_scope);
if (ret)
return ret;
break;
return -EINVAL;
}
event->name = g_quark_from_string(right);
- free(right);
+ g_free(right);
CTF_EVENT_SET_FIELD(event, name);
} else if (!strcmp(left, "id")) {
if (CTF_EVENT_FIELD_IS_SET(event, id))
fprintf(stderr, "[error] %s: stream id %" PRIu64 " cannot be found\n", __func__, event->stream_id);
return -EINVAL;
}
- event->definition_scope = new_definition_scope(stream->definition_scope);
- if (!event->definition_scope) {
- fprintf(stderr, "[error] %s: Error allocating declaration scope\n", __func__);
- return -EPERM;
- }
CTF_EVENT_SET_FIELD(event, stream_id);
} else if (!strcmp(left, "context")) {
struct declaration *declaration;
return -EPERM;
declaration = ctf_declaration_specifier_visit(fd, depth,
&node->u.ctf_expression.right,
- event->type_scope, event->definition_scope);
+ event->declaration_scope);
if (!declaration)
return -EPERM;
if (declaration->type->id != CTF_TYPE_STRUCT)
return -EPERM;
- event->context = container_of(declaration, struct declaration_struct, p);
+ event->context_decl = container_of(declaration, struct declaration_struct, p);
} else if (!strcmp(left, "fields")) {
struct declaration *declaration;
return -EPERM;
declaration = ctf_declaration_specifier_visit(fd, depth,
&node->u.ctf_expression.right,
- event->type_scope, event->definition_scope);
+ event->declaration_scope);
if (!declaration)
return -EPERM;
if (declaration->type->id != CTF_TYPE_STRUCT)
return -EPERM;
- event->fields = container_of(declaration, struct declaration_struct, p);
+ event->fields_decl = container_of(declaration, struct declaration_struct, p);
}
- free(left);
+ g_free(left);
break;
}
default:
static
int ctf_event_visit(FILE *fd, int depth, struct ctf_node *node,
- struct type_scope *parent_type_scope, struct ctf_trace *trace)
+ struct declaration_scope *parent_declaration_scope, struct ctf_trace *trace)
{
int ret = 0;
struct ctf_node *iter;
struct ctf_event *event;
+ struct definition_scope *parent_def_scope;
event = g_new0(struct ctf_event, 1);
- event->type_scope = new_type_scope(parent_type_scope);
+ event->declaration_scope = new_declaration_scope(parent_declaration_scope);
cds_list_for_each_entry(iter, &node->u.event.declaration_list, siblings) {
ret = ctf_event_declaration_visit(fd, depth + 1, iter, event, trace);
if (ret)
g_hash_table_insert(event->stream->event_quark_to_id,
(gpointer)(unsigned long) event->name,
&event->id);
+ parent_def_scope = stream->definition_scope;
+ if (event->context_decl) {
+ event->context =
+ event->context_decl->definition_new(event->context_decl,
+ parent_def_scope, 0, 0);
+ set_dynamic_definition_scope(event->context->scope,
+ g_quark_from_string("event.context"));
+ parent_def_scope = event->context->scope;
+ declaration_unref(event->context_decl);
+ }
+ if (event->fields_decl) {
+ event->fields =
+ event->fields_decl->definition_new(event->fields_decl,
+ parent_def_scope, 0, 0);
+ set_dynamic_definition_scope(event->fields->scope,
+ g_quark_from_string("event.fields"));
+ parent_def_scope = event->fields->scope;
+ declaration_unref(event->fields_decl);
+ }
return 0;
error:
- declaration_unref(event->fields);
- declaration_unref(event->context);
+ declaration_unref(event->fields_decl);
+ declaration_unref(event->context_decl);
free_definition_scope(event->definition_scope);
- free_type_scope(event->type_scope);
+ free_declaration_scope(event->declaration_scope);
g_free(event);
return ret;
}
ret = ctf_typedef_visit(fd, depth + 1,
&node->u._typedef.declaration_specifier,
&node->u._typedef.type_declarators,
- stream->type_scope, stream->definition_scope);
+ stream->declaration_scope);
if (ret)
return ret;
break;
case NODE_TYPEALIAS:
ret = ctf_typealias_visit(fd, depth + 1,
&node->u.typealias.target, &node->u.typealias.alias
- stream->type_scope, stream->definition_scope);
+ stream->declaration_scope);
if (ret)
return ret;
break;
return -EINVAL;
}
CTF_EVENT_SET_FIELD(event, stream_id);
- } else if (!strcmp(left, "event_header")) {
+ } else if (!strcmp(left, "event.header")) {
struct declaration *declaration;
declaration = ctf_declaration_specifier_visit(fd, depth,
&node->u.ctf_expression.right,
- stream->type_scope, stream->definition_scope);
+ stream->declaration_scope, stream->definition_scope);
if (!declaration)
return -EPERM;
if (declaration->type->id != CTF_TYPE_STRUCT)
return -EPERM;
- stream->event_header = container_of(declaration, struct declaration_struct, p);
- } else if (!strcmp(left, "event_context")) {
+ stream->event_header_decl = container_of(declaration, struct declaration_struct, p);
+ } else if (!strcmp(left, "event.context")) {
struct declaration *declaration;
declaration = ctf_declaration_specifier_visit(fd, depth,
&node->u.ctf_expression.right,
- stream->type_scope, stream->definition_scope);
+ stream->declaration_scope);
if (!declaration)
return -EPERM;
if (declaration->type->id != CTF_TYPE_STRUCT)
return -EPERM;
- stream->event_context = container_of(declaration, struct declaration_struct, p);
- } else if (!strcmp(left, "packet_context")) {
+ stream->event_context_decl = container_of(declaration, struct declaration_struct, p);
+ } else if (!strcmp(left, "packet.context")) {
struct declaration *declaration;
declaration = ctf_declaration_specifier_visit(fd, depth,
&node->u.ctf_expression.right,
- stream->type_scope, stream->definition_scope);
+ stream->declaration_scope);
if (!declaration)
return -EPERM;
if (declaration->type->id != CTF_TYPE_STRUCT)
return -EPERM;
- stream->packet_context = container_of(declaration, struct declaration_struct, p);
+ stream->packet_context_decl = container_of(declaration, struct declaration_struct, p);
}
- free(left);
+ g_free(left);
break;
}
default:
static
int ctf_stream_visit(FILE *fd, int depth, struct ctf_node *node,
- struct type_scope *parent_type_scope, struct ctf_trace *trace)
+ struct declaration_scope *parent_declaration_scope, struct ctf_trace *trace)
{
int ret = 0;
struct ctf_node *iter;
struct ctf_stream *stream;
+ struct definition_scope *parent_def_scope;
stream = g_new0(struct ctf_stream, 1);
- stream->type_scope = new_type_scope(parent_type_scope);
- stream->definition_scope = new_definition_scope(trace->definition_scope);
+ 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);
cds_list_for_each_entry(iter, &node->u.stream.declaration_list, siblings) {
if (trace->streams->len <= stream->stream_id)
g_ptr_array_set_size(trace->streams, stream->stream_id + 1);
g_ptr_array_index(trace->streams, stream->stream_id) = stream;
+
+ parent_def_scope = NULL;
+ if (stream->packet_context_decl) {
+ stream->packet_context =
+ stream->packet_context_decl->definition_new(stream->packet_context_decl,
+ parent_def_scope, 0, 0);
+ set_dynamic_definition_scope(stream->packet_context->scope,
+ g_quark_from_string("stream.packet.context"));
+ parent_def_scope = stream->packet_context->scope;
+ declaration_unref(stream->packet_context_decl);
+ }
+ if (stream->event_header_decl) {
+ stream->event_header =
+ stream->event_header_decl->definition_new(stream->event_header_decl,
+ parent_def_scope, 0, 0);
+ set_dynamic_definition_scope(stream->event_header->scope,
+ g_quark_from_string("stream.event.header"));
+ parent_def_scope = stream->event_header->scope;
+ declaration_unref(stream->event_header_decl);
+ }
+ if (stream->event_context_decl) {
+ stream->event_context =
+ stream->event_context_decl->definition_new(stream->event_context_decl,
+ parent_def_scope, 0, 0);
+ set_dynamic_definition_scope(stream->event_context_scope,
+ g_quark_from_string("stream.event.context"));
+ parent_def_scope = stream->event_context->scope;
+ declaration_unref(stream->event_context_decl);
+ }
+ stream->definition_scope = parent_def_scope;
+
return 0;
error:
g_ptr_array_free(stream->events_by_id, TRUE);
g_hash_table_free(stream->event_quark_to_id);
free_definition_scope(stream->definition_scope);
- free_type_scope(stream->type_scope);
+ free_declaration_scope(stream->declaration_scope);
g_free(stream);
return ret;
}
ret = ctf_typedef_visit(fd, depth + 1,
&node->u._typedef.declaration_specifier,
&node->u._typedef.type_declarators,
- trace->type_scope, trace->definition_scope);
+ trace->declaration_scope);
if (ret)
return ret;
break;
case NODE_TYPEALIAS:
ret = ctf_typealias_visit(fd, depth + 1,
&node->u.typealias.target, &node->u.typealias.alias
- trace->type_scope, trace->definition_scope);
+ trace->declaration_scope);
if (ret)
return ret;
break;
}
CTF_EVENT_SET_FIELD(trace, uuid);
}
- free(left);
+ g_free(left);
break;
}
default:
int ret = 0;
struct ctf_node *iter;
- if (trace->type_scope)
+ if (trace->declaration_scope)
return -EEXIST;
- trace->type_scope = new_type_scope(trace->root_type_scope);
- trace->definition_scope = new_definition_scope(trace->root_definition_scope);
+ trace->declaration_scope = new_declaration_scope(trace->root_declaration_scope);
+ trace->definition_scope = new_dynamic_definition_scope(trace->root_definition_scope);
trace->streams = g_ptr_array_new();
cds_list_for_each_entry(iter, &node->u.trace.declaration_list, siblings) {
ret = ctf_trace_declaration_visit(fd, depth + 1, iter, trace);
error:
g_ptr_array_free(trace->streams, TRUE);
free_definition_scope(stream->definition_scope);
- free_type_scope(stream->type_scope);
+ free_declaration_scope(stream->declaration_scope);
return ret;
}
ret = ctf_typedef_visit(fd, depth + 1,
&iter->u._typedef.declaration_specifier,
&iter->u._typedef.type_declarators,
- trace->type_scope, trace->definition_scope);
+ trace->declaration_scope);
if (ret)
return ret;
}
siblings) {
ret = ctf_typealias_visit(fd, depth + 1,
&iter->u.typealias.target, &iter->u.typealias.alias
- trace->type_scope, trace->definition_scope);
+ trace->declaration_scope);
if (ret)
return ret;
}
cds_list_for_each_entry(iter, &node->u.root.declaration_specifier, siblings) {
ret = ctf_declaration_specifier_visit(fd, depth, iter,
- trace->root_type_scope,
- trace->root_definition_scope);
+ trace->root_declaration_scope);
if (ret)
return ret;
}
}
cds_list_for_each_entry(iter, &node->u.root.stream, siblings) {
ret = ctf_stream_visit(fd, depth + 1, iter,
- trace->type_scope, trace);
+ trace->root_declaration_scope, trace);
if (ret)
return ret;
}
cds_list_for_each_entry(iter, &node->u.root.event, siblings) {
ret = ctf_event_visit(fd, depth + 1, iter,
- trace->type_scope, trace);
+ trace->root_declaration_scope, trace);
if (ret)
return ret;
}
projects / babeltrace.git / blobdiff