From cadd09e9216876ec676ee71624ba80e1fe0ca56e Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Tue, 7 Feb 2012 09:28:33 -0500 Subject: [PATCH] Parse environment declarations from LTTng-modules and LTTng-UST LTTng-UST: vpid, procname, domain. LTTng-modules: domain, sysname, release, version. Signed-off-by: Mathieu Desnoyers --- .../metadata/ctf-visitor-generate-io-struct.c | 145 ++++++++++++++++-- include/babeltrace/ctf-ir/metadata.h | 15 ++ 2 files changed, 149 insertions(+), 11 deletions(-) diff --git a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c index 2db25794..b0be8721 100644 --- a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c +++ b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c @@ -2301,11 +2301,136 @@ 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; + } 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'; + } 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'; + } 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'; + } 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'; + } 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'; + } 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) { - fprintf(fd, "[warning] %s: environment declaration support not implement yet.\n", __func__); - return 0; /* continue */ + 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 @@ -2372,15 +2497,6 @@ retry: switch (node->type) { case NODE_ROOT: if (!env_clock_done) { - 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; - } - } - /* * declarations need to query clock hash table, * so clock need to be treated first. @@ -2424,6 +2540,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); diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h index dde51bb4..699db2ee 100644 --- a/include/babeltrace/ctf-ir/metadata.h +++ b/include/babeltrace/ctf-ir/metadata.h @@ -108,6 +108,20 @@ struct ctf_clock { (ctf_trace)->(field); \ }) +#define TRACER_ENV_LEN 128 + +/* tracer-specific environment */ +struct ctf_tracer_env { + int vpid; /* negative if unset */ + + /* All strings below: "" if unset. */ + char procname[TRACER_ENV_LEN]; + char domain[TRACER_ENV_LEN]; + char sysname[TRACER_ENV_LEN]; + char release[TRACER_ENV_LEN]; + char version[TRACER_ENV_LEN]; +}; + struct ctf_trace { struct trace_descriptor parent; /* root scope */ @@ -127,6 +141,7 @@ struct ctf_trace { uint64_t minor; uuid_t uuid; int byte_order; /* trace BYTE_ORDER. 0 if unset. */ + struct ctf_tracer_env env; enum { /* Fields populated mask */ CTF_TRACE_major = (1U << 0), -- 2.34.1