X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fmi-lttng.c;h=fc7207cb4137a1f9317a2525b20e38cce2c34ef8;hp=cd5c082fd316bb867216be8acf40c2e60ee6a387;hb=5cdb6027a2b78fd93aa7f61174625190b5fc3459;hpb=f4a088f723845847249e069fea4d0c1b579d5fd1

diff --git a/src/common/mi-lttng.c b/src/common/mi-lttng.c
index cd5c082fd..fc7207cb4 100644
--- a/src/common/mi-lttng.c
+++ b/src/common/mi-lttng.c
@@ -114,6 +114,17 @@ const char * const mi_lttng_loglevel_str_notice = "TRACE_NOTICE";
 const char * const mi_lttng_loglevel_str_unknown = "UNKNOWN";
 const char * const mi_lttng_loglevel_str_warning = "TRACE_WARNING";
 
+/* String related to loglevel JUL */
+const char * const mi_lttng_loglevel_str_jul_all = "JUL_ALL";
+const char * const mi_lttng_loglevel_str_jul_config = "JUL_CONFIG";
+const char * const mi_lttng_loglevel_str_jul_fine = "JUL_FINE";
+const char * const mi_lttng_loglevel_str_jul_finer = "JUL_FINER";
+const char * const mi_lttng_loglevel_str_jul_finest = "JUL_FINEST";
+const char * const mi_lttng_loglevel_str_jul_info = "JUL_INFO";
+const char * const mi_lttng_loglevel_str_jul_off = "JUL_OFF";
+const char * const mi_lttng_loglevel_str_jul_severe = "JUL_SEVERE";
+const char * const mi_lttng_loglevel_str_jul_warning = "JUL_WARNING";
+
 /* String related to loglevel type */
 const char * const mi_lttng_loglevel_type_all = "ALL";
 const char * const mi_lttng_loglevel_type_range = "RANGE";
@@ -132,6 +143,10 @@ const char * const mi_lttng_element_snapshot_n_ptr = "n_ptr";
 const char * const mi_lttng_element_snapshot_session_name = "session_name";
 const char * const mi_lttng_element_snapshots = "snapshots";
 
+/* This is a merge of jul loglevel and regular loglevel
+ * Those should never overlap by definition
+ * (see struct lttng_event loglevel)
+ */
 const char *mi_lttng_loglevel_string(int value)
 {
 	switch (value) {
@@ -167,6 +182,24 @@ const char *mi_lttng_loglevel_string(int value)
 		return mi_lttng_loglevel_str_debug_line;
 	case LTTNG_LOGLEVEL_DEBUG:
 		return mi_lttng_loglevel_str_debug;
+	case LTTNG_LOGLEVEL_JUL_OFF:
+		return mi_lttng_loglevel_str_jul_off;
+	case LTTNG_LOGLEVEL_JUL_SEVERE:
+		return mi_lttng_loglevel_str_jul_severe;
+	case LTTNG_LOGLEVEL_JUL_WARNING:
+		return mi_lttng_loglevel_str_jul_warning;
+	case LTTNG_LOGLEVEL_JUL_INFO:
+		return mi_lttng_loglevel_str_jul_info;
+	case LTTNG_LOGLEVEL_JUL_CONFIG:
+		return mi_lttng_loglevel_str_jul_config;
+	case LTTNG_LOGLEVEL_JUL_FINE:
+		return mi_lttng_loglevel_str_jul_fine;
+	case LTTNG_LOGLEVEL_JUL_FINER:
+		return mi_lttng_loglevel_str_jul_finer;
+	case LTTNG_LOGLEVEL_JUL_FINEST:
+		return mi_lttng_loglevel_str_jul_finest;
+	case LTTNG_LOGLEVEL_JUL_ALL:
+		return mi_lttng_loglevel_str_jul_all;
 	default:
 		return mi_lttng_loglevel_str_unknown;
 	}
@@ -272,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);
@@ -456,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;
 	}
@@ -628,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 */