X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fmi-lttng.c;h=83df149f2bc5c2eb9583ed22854bea70350c1cff;hb=705bb62fac2a79ed3e04232cc831645c852cc1a2;hp=9c98a0dd7712ce589347e0bbd0a285168a6575e5;hpb=136f2f81ca23f95585af57b773d7bc4e04407cda;p=lttng-tools.git diff --git a/src/common/mi-lttng.c b/src/common/mi-lttng.c index 9c98a0dd7..83df149f2 100644 --- a/src/common/mi-lttng.c +++ b/src/common/mi-lttng.c @@ -305,6 +305,8 @@ const char *mi_lttng_domaintype_string(enum lttng_domain_type value) return config_domain_type_ust; case LTTNG_DOMAIN_JUL: return config_domain_type_jul; + case LTTNG_DOMAIN_LOG4J: + return config_domain_type_log4j; default: /* Should not have an unknown domain */ assert(0); @@ -352,7 +354,7 @@ struct mi_writer *mi_lttng_writer_create(int fd_output, int mi_output_type) goto end; } if (mi_output_type == LTTNG_MI_XML) { - mi_writer->writer = config_writer_create(fd_output); + mi_writer->writer = config_writer_create(fd_output, 0); if (!mi_writer->writer) { goto err_destroy; } @@ -489,7 +491,7 @@ int mi_lttng_version(struct mi_writer *writer, struct mi_lttng_version *version, /* Version string (contain info like rc etc.) */ ret = mi_lttng_writer_write_element_string(writer, - mi_lttng_element_version_str, VERSION); + mi_lttng_element_version_str, version->version); if (ret) { goto end; } @@ -661,7 +663,11 @@ int mi_lttng_domain(struct mi_writer *writer, goto end; } - /* TODO: attr... not sure how to use the union.... */ + /* TODO: union attr + * This union is not currently used and was added for + * future ust domain support. + * Date: 25-06-2014 + * */ if (!is_open) { /* Closing domain element */