X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-visitor-generate-io-struct.c;h=2db25794aed6741cea5e8ef1b5dc4afd5740d5f0;hp=31e55f42cb78653cf65fd820de107de4cc0907e5;hb=209209be7f87974d7b4acee9af37a51aced870f3;hpb=e2c76a4d53527de31408fea6535980755c389e68

diff --git a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
index 31e55f42..2db25794 100644
--- a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
+++ b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
@@ -156,10 +156,20 @@ int get_unary_signed(struct cds_list_head *head, int64_t *value)
 
 	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.type == UNARY_UNSIGNED_CONSTANT
+			|| node->u.unary_expression.type == UNARY_SIGNED_CONSTANT);
 		assert(node->u.unary_expression.link == UNARY_LINK_UNKNOWN);
 		assert(i == 0);
-		*value = node->u.unary_expression.u.signed_constant;
+		switch (node->u.unary_expression.type) {
+		case UNARY_UNSIGNED_CONSTANT:
+			*value = (int64_t) node->u.unary_expression.u.unsigned_constant;
+			break;
+		case UNARY_SIGNED_CONSTANT:
+			*value = node->u.unary_expression.u.signed_constant;
+			break;
+		default:
+			assert(0);
+		}
 		i++;
 	}
 	return 0;
@@ -1649,36 +1659,22 @@ 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;
+		} else if (!strcmp(left, "loglevel")) {
+			int64_t loglevel = -1;
 
-			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__);
+			if (CTF_EVENT_FIELD_IS_SET(event, loglevel)) {
+				fprintf(fd, "[error] %s: loglevel already declared in event declaration\n", __func__);
 				ret = -EPERM;
 				goto error;
 			}
-			ret = get_unary_signed(&node->u.ctf_expression.right, &event->loglevel_value);
+			ret = get_unary_signed(&node->u.ctf_expression.right, &loglevel);
 			if (ret) {
-				fprintf(fd, "[error] %s: unexpected unary expression for event loglevel value\n", __func__);
+				fprintf(fd, "[error] %s: unexpected unary expression for event loglevel\n", __func__);
 				ret = -EINVAL;
 				goto error;
 			}
-			CTF_EVENT_SET_FIELD(event, loglevel_value);
+			event->loglevel = (int) loglevel;
+			CTF_EVENT_SET_FIELD(event, loglevel);
 		} else {
 			fprintf(fd, "[warning] %s: attribute \"%s\" is unknown in event declaration.\n", __func__, left);
 			/* Fall-through after warning */
@@ -1705,6 +1701,7 @@ int ctf_event_visit(FILE *fd, int depth, struct ctf_node *node,
 
 	event = g_new0(struct ctf_event, 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) {
 		ret = ctf_event_declaration_visit(fd, depth + 1, iter, event, trace);
 		if (ret)