X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fmi-lttng.c;h=44ff56f1e4ccf16aee5d097b39faa4d233d0f04c;hp=c21ed5a6311491cd875d246c6d4244fb8dda26f9;hb=8de4f9412d9681725c48f984c9e160773fdcf8c9;hpb=970d848b0e1e8e81bc7be0fb43e1fcdcd5a84da7

diff --git a/src/common/mi-lttng.c b/src/common/mi-lttng.c
index c21ed5a63..44ff56f1e 100644
--- a/src/common/mi-lttng.c
+++ b/src/common/mi-lttng.c
@@ -16,7 +16,8 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-
+#define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <include/config.h>
 #include <common/config/config.h>
 #include <lttng/snapshot-internal.h>
@@ -49,6 +50,8 @@ const char * const mi_lttng_element_command_snapshot_record = "record_snapshot";
 const char * const mi_lttng_element_command_start = "start";
 const char * const mi_lttng_element_command_stop = "stop";
 const char * const mi_lttng_element_command_success = "success";
+const char * const mi_lttng_element_command_track = "track";
+const char * const mi_lttng_element_command_untrack = "untrack";
 const char * const mi_lttng_element_command_version = "version";
 
 /* Strings related to version command */
@@ -135,6 +138,14 @@ const char * const mi_lttng_loglevel_str_log4j_debug = "LOG4J_DEBUG";
 const char * const mi_lttng_loglevel_str_log4j_trace = "LOG4J_TRACE";
 const char * const mi_lttng_loglevel_str_log4j_all = "LOG4J_ALL";
 
+/* String related to loglevel Python */
+const char * const mi_lttng_loglevel_str_python_critical = "PYTHON_CRITICAL";
+const char * const mi_lttng_loglevel_str_python_error = "PYTHON_ERROR";
+const char * const mi_lttng_loglevel_str_python_warning = "PYTHON_WARNING";
+const char * const mi_lttng_loglevel_str_python_info = "PYTHON_INFO";
+const char * const mi_lttng_loglevel_str_python_debug = "PYTHON_DEBUG";
+const char * const mi_lttng_loglevel_str_python_notset = "PYTHON_NOTSET";
+
 /* String related to loglevel type */
 const char * const mi_lttng_loglevel_type_all = "ALL";
 const char * const mi_lttng_loglevel_type_range = "RANGE";
@@ -250,6 +261,24 @@ const char *mi_lttng_loglevel_string(int value, enum lttng_domain_type domain)
 			return mi_lttng_loglevel_str_unknown;
 		}
 		break;
+	case LTTNG_DOMAIN_PYTHON:
+		switch (value) {
+		case LTTNG_LOGLEVEL_PYTHON_CRITICAL:
+			return mi_lttng_loglevel_str_python_critical;
+		case LTTNG_LOGLEVEL_PYTHON_ERROR:
+			return mi_lttng_loglevel_str_python_error;
+		case LTTNG_LOGLEVEL_PYTHON_WARNING:
+			return mi_lttng_loglevel_str_python_warning;
+		case LTTNG_LOGLEVEL_PYTHON_INFO:
+			return mi_lttng_loglevel_str_python_info;
+		case LTTNG_LOGLEVEL_PYTHON_DEBUG:
+			return mi_lttng_loglevel_str_python_debug;
+		case LTTNG_LOGLEVEL_PYTHON_NOTSET:
+			return mi_lttng_loglevel_str_python_notset;
+		default:
+			return mi_lttng_loglevel_str_unknown;
+		}
+		break;
 	}
 
 	/* Reaching this means the domain is unknown. */
@@ -1211,6 +1240,9 @@ int mi_lttng_calibrate(struct mi_writer *writer,
 end:
 	return ret;
 }
+
+/* TODO: mi tracker */
+
 LTTNG_HIDDEN
 int mi_lttng_context(struct mi_writer *writer,
 		struct lttng_event_context *context, int is_open)
@@ -1314,6 +1346,9 @@ int mi_lttng_snapshot_output_session_name(struct mi_writer *writer,
 	/* Snapshot output list for current session name */
 	ret = mi_lttng_writer_write_element_string(writer, config_element_name,
 			session_name);
+	if (ret) {
+		goto end;
+	}
 
 	/* Open element snapshots (sequence one snapshot) */
 	ret = mi_lttng_writer_open_element(writer, mi_lttng_element_snapshots);