X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-visitor-generate-io-struct.c;h=4a71a27e04024dae8ecfab95d69cd5854391bc13;hp=dee8384d703b07778fd5fa46b1045a6b0e1ce7d0;hb=6070d2f1612a27050f14362a910b565b8e70662c;hpb=11ac667403ca915f51cc5981fa4bb8bd443fb606

diff --git a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
index dee8384d..4a71a27e 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)
@@ -2304,6 +2301,144 @@ void clock_free(gpointer data)
 	g_free(clock);
 }
 
+static
+int ctf_env_declaration_visit(FILE *fd, int depth, struct ctf_node *node,
+		struct ctf_trace *trace)
+{
+	int ret = 0;
+	struct ctf_tracer_env *env = &trace->env;
+
+	switch (node->type) {
+	case NODE_CTF_EXPRESSION:
+	{
+		char *left;
+
+		left = concatenate_unary_strings(&node->u.ctf_expression.left);
+		if (!strcmp(left, "vpid")) {
+			uint64_t v;
+
+			if (env->vpid != -1) {
+				fprintf(fd, "[error] %s: vpid already declared in env declaration\n", __func__);
+				goto error;	/* ret is 0, so not an actual error, just warn. */
+			}
+			ret = get_unary_unsigned(&node->u.ctf_expression.right, &v);
+			if (ret) {
+				fprintf(fd, "[error] %s: unexpected unary expression for env vpid\n", __func__);
+				goto error;	/* ret is 0, so not an actual error, just warn. */
+			}
+			env->vpid = (int) v;
+			printf_verbose("env.vpid = %d\n", env->vpid);
+		} else if (!strcmp(left, "procname")) {
+			char *right;
+
+			if (env->procname[0]) {
+				fprintf(fd, "[warning] %s: duplicated env procname\n", __func__);
+				goto error;	/* ret is 0, so not an actual error, just warn. */
+			}
+			right = concatenate_unary_strings(&node->u.ctf_expression.right);
+			if (!right) {
+				fprintf(fd, "[warning] %s: unexpected unary expression for env procname\n", __func__);
+				goto error;	/* ret is 0, so not an actual error, just warn. */
+			}
+			strncpy(env->procname, right, TRACER_ENV_LEN);
+			env->procname[TRACER_ENV_LEN - 1] = '\0';
+			printf_verbose("env.procname = %s\n", env->procname);
+		} else if (!strcmp(left, "domain")) {
+			char *right;
+
+			if (env->domain[0]) {
+				fprintf(fd, "[warning] %s: duplicated env domain\n", __func__);
+				goto error;	/* ret is 0, so not an actual error, just warn. */
+			}
+			right = concatenate_unary_strings(&node->u.ctf_expression.right);
+			if (!right) {
+				fprintf(fd, "[warning] %s: unexpected unary expression for env domain\n", __func__);
+				goto error;	/* ret is 0, so not an actual error, just warn. */
+			}
+			strncpy(env->domain, right, TRACER_ENV_LEN);
+			env->domain[TRACER_ENV_LEN - 1] = '\0';
+			printf_verbose("env.domain = %s\n", env->domain);
+		} else if (!strcmp(left, "sysname")) {
+			char *right;
+
+			if (env->sysname[0]) {
+				fprintf(fd, "[warning] %s: duplicated env sysname\n", __func__);
+				goto error;	/* ret is 0, so not an actual error, just warn. */
+			}
+			right = concatenate_unary_strings(&node->u.ctf_expression.right);
+			if (!right) {
+				fprintf(fd, "[warning] %s: unexpected unary expression for env sysname\n", __func__);
+				goto error;	/* ret is 0, so not an actual error, just warn. */
+			}
+			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")) {
+			char *right;
+
+			if (env->release[0]) {
+				fprintf(fd, "[warning] %s: duplicated env release\n", __func__);
+				goto error;	/* ret is 0, so not an actual error, just warn. */
+			}
+			right = concatenate_unary_strings(&node->u.ctf_expression.right);
+			if (!right) {
+				fprintf(fd, "[warning] %s: unexpected unary expression for env release\n", __func__);
+				goto error;	/* ret is 0, so not an actual error, just warn. */
+			}
+			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")) {
+			char *right;
+
+			if (env->version[0]) {
+				fprintf(fd, "[warning] %s: duplicated env version\n", __func__);
+				goto error;	/* ret is 0, so not an actual error, just warn. */
+			}
+			right = concatenate_unary_strings(&node->u.ctf_expression.right);
+			if (!right) {
+				fprintf(fd, "[warning] %s: unexpected unary expression for env version\n", __func__);
+				goto error;	/* ret is 0, so not an actual error, just warn. */
+			}
+			strncpy(env->version, right, TRACER_ENV_LEN);
+			env->version[TRACER_ENV_LEN - 1] = '\0';
+			printf_verbose("env.version = %s\n", env->version);
+		} else {
+			printf_verbose("%s: attribute \"%s\" is unknown in environment declaration.\n", __func__, left);
+		}
+
+error:
+		g_free(left);
+		break;
+	}
+	default:
+		return -EPERM;
+	}
+
+	return ret;
+}
+
+static
+int ctf_env_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace *trace)
+{
+	int ret = 0;
+	struct ctf_node *iter;
+
+	trace->env.vpid = -1;
+	trace->env.procname[0] = '\0';
+	trace->env.domain[0] = '\0';
+	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) {
+		ret = ctf_env_declaration_visit(fd, depth + 1, iter, trace);
+		if (ret)
+			goto error;
+	}
+error:
+	return 0;
+}
+
 static
 int ctf_root_declaration_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace *trace)
 {
@@ -2355,7 +2490,7 @@ int ctf_visitor_construct_metadata(FILE *fd, int depth, struct ctf_node *node,
 {
 	int ret = 0;
 	struct ctf_node *iter;
-	int clock_done = 0;
+	int env_clock_done = 0;
 
 	printf_verbose("CTF visitor: metadata construction... ");
 	trace->byte_order = byte_order;
@@ -2367,7 +2502,7 @@ retry:
 
 	switch (node->type) {
 	case NODE_ROOT:
-		if (!clock_done) {
+		if (!env_clock_done) {
 			/*
 			 * declarations need to query clock hash table,
 			 * so clock need to be treated first.
@@ -2380,7 +2515,7 @@ retry:
 					goto error;
 				}
 			}
-			clock_done = 1;
+			env_clock_done = 1;
 		}
 		cds_list_for_each_entry(iter, &node->u.root.declaration_list,
 					siblings) {
@@ -2411,6 +2546,13 @@ retry:
 			ret = -EINVAL;
 			goto error;
 		}
+		cds_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) {
 			ret = ctf_stream_visit(fd, depth + 1, iter,
 		    			       trace->root_declaration_scope, trace);