X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-visitor-generate-io-struct.c;h=9d9a6f2b8bb997953781f5edba32459e105b175d;hp=725235d18a8d66a980134600fe44dade95aec6bc;hb=73d159163aa1c2b8e9da78ade3ded6ef1c81513f;hpb=70bd0a12b09ce7f233189cf07e090fda593ebc48

diff --git a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
index 725235d1..9d9a6f2b 100644
--- a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
+++ b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
@@ -104,6 +104,23 @@ int get_unary_unsigned(struct cds_list_head *head, uint64_t *value)
 	return 0;
 }
 
+static
+int get_unary_signed(struct cds_list_head *head, int64_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.u.signed_constant;
+		i++;
+	}
+	return 0;
+}
+
 static
 int get_unary_uuid(struct cds_list_head *head, uuid_t *uuid)
 {
@@ -1217,6 +1234,22 @@ struct declaration *ctf_declaration_integer_visit(FILE *fd, int depth,
 				return NULL;
 			}
 			g_free(s_right);
+		} else if (!strcmp(left->u.unary_expression.u.string, "map")) {
+			char *s_right;
+
+			if (right->u.unary_expression.type != UNARY_STRING) {
+				fprintf(fd, "[error] %s: map: expecting identifier\n",
+					__func__);
+				return NULL;
+			}
+			s_right = concatenate_unary_strings(&expression->u.ctf_expression.right);
+			if (!s_right) {
+				fprintf(fd, "[error] %s: unexpected unary expression for integer map\n", __func__);
+				g_free(s_right);
+				return NULL;
+			}
+			/* TODO: lookup */
+
 		} else {
 			fprintf(fd, "[error] %s: unknown attribute name %s\n",
 				__func__, left->u.unary_expression.u.string);
@@ -1550,6 +1583,36 @@ int ctf_event_declaration_visit(FILE *fd, int depth, struct ctf_node *node, stru
 				goto error;
 			}
 			event->fields_decl = container_of(declaration, struct declaration_struct, p);
+		} else if (!strcmp(left, "loglevel.identifier")) {
+			char *right;
+
+			if (CTF_EVENT_FIELD_IS_SET(event, loglevel_identifier)) {
+				fprintf(fd, "[error] %s: identifier already declared in event declaration\n", __func__);
+				ret = -EPERM;
+				goto error;
+			}
+			right = concatenate_unary_strings(&node->u.ctf_expression.right);
+			if (!right) {
+				fprintf(fd, "[error] %s: unexpected unary expression for event identifier\n", __func__);
+				ret = -EINVAL;
+				goto error;
+			}
+			event->loglevel_identifier = g_quark_from_string(right);
+			g_free(right);
+			CTF_EVENT_SET_FIELD(event, loglevel_identifier);
+		} else if (!strcmp(left, "loglevel.value")) {
+			if (CTF_EVENT_FIELD_IS_SET(event, loglevel_value)) {
+				fprintf(fd, "[error] %s: loglevel value already declared in event declaration\n", __func__);
+				ret = -EPERM;
+				goto error;
+			}
+			ret = get_unary_signed(&node->u.ctf_expression.right, &event->loglevel_value);
+			if (ret) {
+				fprintf(fd, "[error] %s: unexpected unary expression for event loglevel value\n", __func__);
+				ret = -EINVAL;
+				goto error;
+			}
+			CTF_EVENT_SET_FIELD(event, loglevel_value);
 		} else {
 			fprintf(fd, "[error] %s: attribute \"%s\" is unknown in event declaration.\n", __func__, left);
 			ret = -EINVAL;
@@ -1793,6 +1856,7 @@ int ctf_stream_visit(FILE *fd, int depth, struct ctf_node *node,
 	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;
+	stream->trace = trace;
 
 	return 0;