lttng: Implement lttng clear session command
[lttng-tools.git] / src / common / mi-lttng.c
index 9c98a0dd7712ce589347e0bbd0a285168a6575e5..d95d38ffb4443978ae8939b42396f6a94977488b 100644 (file)
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2014 - Jonathan Rajotte <jonathan.r.julien@gmail.com>
  *                    - Olivier Cotte <olivier.cotte@polymtl.ca>
+ * Copyright (C) 2016 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License, version 2 only, as
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-
-#include <include/config.h>
-#include <common/config/config.h>
+#define _LGPL_SOURCE
+#include <common/config/session-config.h>
+#include <common/defaults.h>
 #include <lttng/snapshot-internal.h>
+#include <lttng/channel.h>
 #include "mi-lttng.h"
 
 #include <assert.h>
 
+#define MI_SCHEMA_MAJOR_VERSION 3
+#define MI_SCHEMA_MINOR_VERSION 0
+
+/* Machine interface namespace URI */
+LTTNG_HIDDEN const char * const mi_lttng_xmlns = "xmlns";
+LTTNG_HIDDEN const char * const mi_lttng_xmlns_xsi = "xmlns:xsi";
+LTTNG_HIDDEN const char * const mi_lttng_w3_schema_uri = "http://www.w3.org/2001/XMLSchema-instance";
+LTTNG_HIDDEN const char * const mi_lttng_schema_location = "xsi:schemaLocation";
+LTTNG_HIDDEN const char * const mi_lttng_schema_location_uri =
+       DEFAULT_LTTNG_MI_NAMESPACE " "
+       "https://lttng.org/xml/schemas/lttng-mi/" XSTR(MI_SCHEMA_MAJOR_VERSION)
+       "/lttng-mi-" XSTR(MI_SCHEMA_MAJOR_VERSION) "."
+       XSTR(MI_SCHEMA_MINOR_VERSION) ".xsd";
+LTTNG_HIDDEN const char * const mi_lttng_schema_version = "schemaVersion";
+LTTNG_HIDDEN const char * const mi_lttng_schema_version_value = XSTR(MI_SCHEMA_MAJOR_VERSION)
+       "." XSTR(MI_SCHEMA_MINOR_VERSION);
+
 /* Strings related to command */
 const char * const mi_lttng_element_command = "command";
 const char * const mi_lttng_element_command_action = "snapshot_action";
 const char * const mi_lttng_element_command_add_context = "add-context";
-const char * const mi_lttng_element_command_calibrate = "calibrate";
 const char * const mi_lttng_element_command_create = "create";
 const char * const mi_lttng_element_command_destroy = "destroy";
 const char * const mi_lttng_element_command_disable_channel = "disable-channel";
@@ -37,6 +55,10 @@ const char * const mi_lttng_element_command_enable_channels = "enable-channel";
 const char * const mi_lttng_element_command_enable_event = "enable-event";
 const char * const mi_lttng_element_command_list = "list";
 const char * const mi_lttng_element_command_load = "load";
+LTTNG_HIDDEN const char * const mi_lttng_element_command_metadata = "metadata";
+LTTNG_HIDDEN const char * const mi_lttng_element_command_metadata_action = "metadata_action";
+LTTNG_HIDDEN const char * const mi_lttng_element_command_regenerate = "regenerate";
+LTTNG_HIDDEN const char * const mi_lttng_element_command_regenerate_action = "regenerate_action";
 const char * const mi_lttng_element_command_name = "name";
 const char * const mi_lttng_element_command_output = "output";
 const char * const mi_lttng_element_command_save = "save";
@@ -49,7 +71,13 @@ 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";
+LTTNG_HIDDEN const char * const mi_lttng_element_command_rotate = "rotate";
+LTTNG_HIDDEN const char * const mi_lttng_element_command_enable_rotation = "enable-rotation";
+LTTNG_HIDDEN const char * const mi_lttng_element_command_disable_rotation = "disable-rotation";
+LTTNG_HIDDEN const char * const mi_lttng_element_command_clear = "clear";
 
 /* Strings related to version command */
 const char * const mi_lttng_element_version = "version";
@@ -66,17 +94,10 @@ const char * const mi_lttng_element_version_web = "url";
 const char * const mi_lttng_element_event_field = "event_field";
 const char * const mi_lttng_element_event_fields = "event_fields";
 
-/* String related to lttng_event_context */
-const char * const mi_lttng_context_type_perf_counter = "PERF_COUNTER";
-const char * const mi_lttng_context_type_perf_cpu_counter = "PERF_CPU_COUNTER";
-const char * const mi_lttng_context_type_perf_thread_counter = "PERF_THREAD_COUNTER";
-
 /* String related to lttng_event_perf_counter_ctx */
-const char * const mi_lttng_element_perf_counter_context = "perf_counter_context";
+const char * const mi_lttng_element_perf_counter_context = "perf";
 
 /* Strings related to pid */
-const char * const mi_lttng_element_pids = "pids";
-const char * const mi_lttng_element_pid = "pid";
 const char * const mi_lttng_element_pid_id = "id";
 
 /* Strings related to save command */
@@ -84,6 +105,8 @@ const char * const mi_lttng_element_save = "save";
 
 /* Strings related to load command */
 const char * const mi_lttng_element_load = "load";
+LTTNG_HIDDEN const char * const mi_lttng_element_load_overrides = "overrides";
+LTTNG_HIDDEN const char * const mi_lttng_element_load_override_url = "url";
 
 /* General elements of mi_lttng */
 const char * const mi_lttng_element_empty = "";
@@ -125,16 +148,30 @@ 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 LOG4J */
+const char * const mi_lttng_loglevel_str_log4j_off = "LOG4J_OFF";
+const char * const mi_lttng_loglevel_str_log4j_fatal = "LOG4J_FATAL";
+const char * const mi_lttng_loglevel_str_log4j_error = "LOG4J_ERROR";
+const char * const mi_lttng_loglevel_str_log4j_warn = "LOG4J_WARN";
+const char * const mi_lttng_loglevel_str_log4j_info = "LOG4J_INFO";
+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";
 const char * const mi_lttng_loglevel_type_single = "SINGLE";
 const char * const mi_lttng_loglevel_type_unknown = "UNKNOWN";
 
-/* String related to lttng_calibrate */
-const char * const mi_lttng_element_calibrate = "calibrate";
-const char * const mi_lttng_element_calibrate_function = "FUNCTION";
-
 /* String related to a lttng_snapshot_output */
 const char * const mi_lttng_element_snapshot_ctrl_url = "ctrl_url";
 const char * const mi_lttng_element_snapshot_data_url = "data_url";
@@ -143,68 +180,176 @@ 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";
 
+/* String related to track/untrack command */
+const char * const mi_lttng_element_track_untrack_all_wildcard = "*";
+
+LTTNG_HIDDEN const char * const mi_lttng_element_session_name = "session_name";
+
+/* String related to rotate command */
+LTTNG_HIDDEN const char * const mi_lttng_element_rotation = "rotation";
+LTTNG_HIDDEN const char * const mi_lttng_element_rotate_status = "status";
+LTTNG_HIDDEN const char * const mi_lttng_element_rotation_schedule = "rotation_schedule";
+LTTNG_HIDDEN const char * const mi_lttng_element_rotation_schedules = "rotation_schedules";
+LTTNG_HIDDEN const char * const mi_lttng_element_rotation_schedule_result = "rotation_schedule_result";
+LTTNG_HIDDEN const char * const mi_lttng_element_rotation_schedule_results = "rotation_schedule_results";
+LTTNG_HIDDEN const char * const mi_lttng_element_rotation_schedule_periodic = "periodic";
+LTTNG_HIDDEN const char * const mi_lttng_element_rotation_schedule_periodic_time_us = "time_us";
+LTTNG_HIDDEN const char * const mi_lttng_element_rotation_schedule_size_threshold = "size_threshold";
+LTTNG_HIDDEN const char * const mi_lttng_element_rotation_schedule_size_threshold_bytes = "bytes";
+LTTNG_HIDDEN const char * const mi_lttng_element_rotation_state = "state";
+LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location = "location";
+LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location_local = "local";
+LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location_local_absolute_path = "absolute_path";
+LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location_relay = "relay";
+LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location_relay_host = "host";
+LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location_relay_control_port = "control_port";
+LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location_relay_data_port = "data_port";
+LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location_relay_protocol = "protocol";
+LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location_relay_relative_path = "relative_path";
+
+/* String related to enum lttng_rotation_state */
+LTTNG_HIDDEN const char * const mi_lttng_rotation_state_str_ongoing = "ONGOING";
+LTTNG_HIDDEN const char * const mi_lttng_rotation_state_str_completed = "COMPLETED";
+LTTNG_HIDDEN const char * const mi_lttng_rotation_state_str_expired = "EXPIRED";
+LTTNG_HIDDEN const char * const mi_lttng_rotation_state_str_error = "ERROR";
+
+/* String related to enum lttng_trace_archive_location_relay_protocol_type */
+LTTNG_HIDDEN const char * const mi_lttng_rotation_location_relay_protocol_str_tcp = "TCP";
+
+/* String related to add-context command */
+LTTNG_HIDDEN const char * const mi_lttng_element_context_symbol = "symbol";
+
+/* Deprecated symbols preserved for ABI compatibility. */
+const char * const mi_lttng_context_type_perf_counter;
+const char * const mi_lttng_context_type_perf_cpu_counter;
+const char * const mi_lttng_context_type_perf_thread_counter;
+const char * const mi_lttng_element_track_untrack_pid_target;
+const char * const mi_lttng_element_track_untrack_targets;
+const char * const mi_lttng_element_calibrate;
+const char * const mi_lttng_element_calibrate_function;
+const char * const mi_lttng_element_command_calibrate;
+
 /* 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)
+LTTNG_HIDDEN
+const char *mi_lttng_loglevel_string(int value, enum lttng_domain_type domain)
 {
-       switch (value) {
-       case -1:
-               return mi_lttng_element_empty;
-       case LTTNG_LOGLEVEL_EMERG:
-               return mi_lttng_loglevel_str_emerg;
-       case LTTNG_LOGLEVEL_ALERT:
-               return mi_lttng_loglevel_str_alert;
-       case LTTNG_LOGLEVEL_CRIT:
-               return mi_lttng_loglevel_str_crit;
-       case LTTNG_LOGLEVEL_ERR:
-               return mi_lttng_loglevel_str_err;
-       case LTTNG_LOGLEVEL_WARNING:
-               return mi_lttng_loglevel_str_warning;
-       case LTTNG_LOGLEVEL_NOTICE:
-               return mi_lttng_loglevel_str_notice;
-       case LTTNG_LOGLEVEL_INFO:
-               return mi_lttng_loglevel_str_info;
-       case LTTNG_LOGLEVEL_DEBUG_SYSTEM:
-               return mi_lttng_loglevel_str_debug_system;
-       case LTTNG_LOGLEVEL_DEBUG_PROGRAM:
-               return mi_lttng_loglevel_str_debug_program;
-       case LTTNG_LOGLEVEL_DEBUG_PROCESS:
-               return mi_lttng_loglevel_str_debug_process;
-       case LTTNG_LOGLEVEL_DEBUG_MODULE:
-               return mi_lttng_loglevel_str_debug_module;
-       case LTTNG_LOGLEVEL_DEBUG_UNIT:
-               return mi_lttng_loglevel_str_debug_unit;
-       case LTTNG_LOGLEVEL_DEBUG_FUNCTION:
-               return mi_lttng_loglevel_str_debug_function;
-       case LTTNG_LOGLEVEL_DEBUG_LINE:
-               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;
+       switch (domain) {
+       case LTTNG_DOMAIN_KERNEL:
+       case LTTNG_DOMAIN_UST:
+               switch (value) {
+               case -1:
+                       return mi_lttng_element_empty;
+               case LTTNG_LOGLEVEL_EMERG:
+                       return mi_lttng_loglevel_str_emerg;
+               case LTTNG_LOGLEVEL_ALERT:
+                       return mi_lttng_loglevel_str_alert;
+               case LTTNG_LOGLEVEL_CRIT:
+                       return mi_lttng_loglevel_str_crit;
+               case LTTNG_LOGLEVEL_ERR:
+                       return mi_lttng_loglevel_str_err;
+               case LTTNG_LOGLEVEL_WARNING:
+                       return mi_lttng_loglevel_str_warning;
+               case LTTNG_LOGLEVEL_NOTICE:
+                       return mi_lttng_loglevel_str_notice;
+               case LTTNG_LOGLEVEL_INFO:
+                       return mi_lttng_loglevel_str_info;
+               case LTTNG_LOGLEVEL_DEBUG_SYSTEM:
+                       return mi_lttng_loglevel_str_debug_system;
+               case LTTNG_LOGLEVEL_DEBUG_PROGRAM:
+                       return mi_lttng_loglevel_str_debug_program;
+               case LTTNG_LOGLEVEL_DEBUG_PROCESS:
+                       return mi_lttng_loglevel_str_debug_process;
+               case LTTNG_LOGLEVEL_DEBUG_MODULE:
+                       return mi_lttng_loglevel_str_debug_module;
+               case LTTNG_LOGLEVEL_DEBUG_UNIT:
+                       return mi_lttng_loglevel_str_debug_unit;
+               case LTTNG_LOGLEVEL_DEBUG_FUNCTION:
+                       return mi_lttng_loglevel_str_debug_function;
+               case LTTNG_LOGLEVEL_DEBUG_LINE:
+                       return mi_lttng_loglevel_str_debug_line;
+               case LTTNG_LOGLEVEL_DEBUG:
+                       return mi_lttng_loglevel_str_debug;
+               default:
+                       return mi_lttng_loglevel_str_unknown;
+               }
+               break;
+       case LTTNG_DOMAIN_LOG4J:
+               switch (value) {
+               case -1:
+                       return mi_lttng_element_empty;
+               case LTTNG_LOGLEVEL_LOG4J_OFF:
+                       return mi_lttng_loglevel_str_log4j_off;
+               case LTTNG_LOGLEVEL_LOG4J_FATAL:
+                       return mi_lttng_loglevel_str_log4j_fatal;
+               case LTTNG_LOGLEVEL_LOG4J_ERROR:
+                       return mi_lttng_loglevel_str_log4j_error;
+               case LTTNG_LOGLEVEL_LOG4J_WARN:
+                       return mi_lttng_loglevel_str_log4j_warn;
+               case LTTNG_LOGLEVEL_LOG4J_INFO:
+                       return mi_lttng_loglevel_str_log4j_info;
+               case LTTNG_LOGLEVEL_LOG4J_DEBUG:
+                       return mi_lttng_loglevel_str_log4j_debug;
+               case LTTNG_LOGLEVEL_LOG4J_TRACE:
+                       return mi_lttng_loglevel_str_log4j_trace;
+               case LTTNG_LOGLEVEL_LOG4J_ALL:
+                       return mi_lttng_loglevel_str_log4j_all;
+               default:
+                       return mi_lttng_loglevel_str_unknown;
+               }
+               break;
+       case LTTNG_DOMAIN_JUL:
+               switch (value) {
+               case -1:
+                       return mi_lttng_element_empty;
+               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;
+               }
+               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;
        default:
                return mi_lttng_loglevel_str_unknown;
        }
 }
 
+LTTNG_HIDDEN
 const char *mi_lttng_logleveltype_string(enum lttng_loglevel_type value)
 {
        switch (value) {
@@ -219,6 +364,7 @@ const char *mi_lttng_logleveltype_string(enum lttng_loglevel_type value)
        }
 }
 
+static
 const char *mi_lttng_eventtype_string(enum lttng_event_type value)
 {
        switch (value) {
@@ -228,6 +374,8 @@ const char *mi_lttng_eventtype_string(enum lttng_event_type value)
                return config_event_type_tracepoint;
        case LTTNG_EVENT_PROBE:
                return config_event_type_probe;
+       case LTTNG_EVENT_USERSPACE_PROBE:
+               return config_event_type_userspace_probe;
        case LTTNG_EVENT_FUNCTION:
                return config_event_type_function;
        case LTTNG_EVENT_FUNCTION_ENTRY:
@@ -241,17 +389,12 @@ const char *mi_lttng_eventtype_string(enum lttng_event_type value)
        }
 }
 
+static
 const char *mi_lttng_event_contexttype_string(enum lttng_event_context_type val)
 {
        switch (val) {
        case LTTNG_EVENT_CONTEXT_PID:
                return config_event_context_pid;
-       case LTTNG_EVENT_CONTEXT_PERF_COUNTER:
-               return mi_lttng_context_type_perf_counter;
-       case LTTNG_EVENT_CONTEXT_PERF_THREAD_COUNTER:
-               return mi_lttng_context_type_perf_thread_counter;
-       case LTTNG_EVENT_CONTEXT_PERF_CPU_COUNTER:
-               return mi_lttng_context_type_perf_cpu_counter;
        case LTTNG_EVENT_CONTEXT_PROCNAME:
                return config_event_context_procname;
        case LTTNG_EVENT_CONTEXT_PRIO:
@@ -274,11 +417,62 @@ const char *mi_lttng_event_contexttype_string(enum lttng_event_context_type val)
                return config_event_context_hostname;
        case LTTNG_EVENT_CONTEXT_IP:
                return config_event_context_ip;
+       case LTTNG_EVENT_CONTEXT_INTERRUPTIBLE:
+               return config_event_context_interruptible;
+       case LTTNG_EVENT_CONTEXT_PREEMPTIBLE:
+               return config_event_context_preemptible;
+       case LTTNG_EVENT_CONTEXT_NEED_RESCHEDULE:
+               return config_event_context_need_reschedule;
+       case LTTNG_EVENT_CONTEXT_MIGRATABLE:
+               return config_event_context_migratable;
+       case LTTNG_EVENT_CONTEXT_CALLSTACK_USER:
+               return config_event_context_callstack_user;
+       case LTTNG_EVENT_CONTEXT_CALLSTACK_KERNEL:
+               return config_event_context_callstack_kernel;
+       case LTTNG_EVENT_CONTEXT_CGROUP_NS:
+               return config_event_context_cgroup_ns;
+       case LTTNG_EVENT_CONTEXT_IPC_NS:
+               return config_event_context_ipc_ns;
+       case LTTNG_EVENT_CONTEXT_MNT_NS:
+               return config_event_context_mnt_ns;
+       case LTTNG_EVENT_CONTEXT_NET_NS:
+               return config_event_context_net_ns;
+       case LTTNG_EVENT_CONTEXT_PID_NS:
+               return config_event_context_pid_ns;
+       case LTTNG_EVENT_CONTEXT_USER_NS:
+               return config_event_context_user_ns;
+       case LTTNG_EVENT_CONTEXT_UTS_NS:
+               return config_event_context_uts_ns;
+       case LTTNG_EVENT_CONTEXT_UID:
+               return config_event_context_uid;
+       case LTTNG_EVENT_CONTEXT_EUID:
+               return config_event_context_euid;
+       case LTTNG_EVENT_CONTEXT_SUID:
+               return config_event_context_suid;
+       case LTTNG_EVENT_CONTEXT_GID:
+               return config_event_context_gid;
+       case LTTNG_EVENT_CONTEXT_EGID:
+               return config_event_context_egid;
+       case LTTNG_EVENT_CONTEXT_SGID:
+               return config_event_context_sgid;
+       case LTTNG_EVENT_CONTEXT_VUID:
+               return config_event_context_vuid;
+       case LTTNG_EVENT_CONTEXT_VEUID:
+               return config_event_context_veuid;
+       case LTTNG_EVENT_CONTEXT_VSUID:
+               return config_event_context_vsuid;
+       case LTTNG_EVENT_CONTEXT_VGID:
+               return config_event_context_vgid;
+       case LTTNG_EVENT_CONTEXT_VEGID:
+               return config_event_context_vegid;
+       case LTTNG_EVENT_CONTEXT_VSGID:
+               return config_event_context_vsgid;
        default:
                return NULL;
        }
 }
 
+LTTNG_HIDDEN
 const char *mi_lttng_eventfieldtype_string(enum lttng_event_field_type val)
 {
        switch (val) {
@@ -295,6 +489,7 @@ const char *mi_lttng_eventfieldtype_string(enum lttng_event_field_type val)
        }
 }
 
+LTTNG_HIDDEN
 const char *mi_lttng_domaintype_string(enum lttng_domain_type value)
 {
        /* Note: This is a *duplicate* of get_domain_str from bin/lttng/utils.c */
@@ -305,12 +500,18 @@ 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;
+       case LTTNG_DOMAIN_PYTHON:
+               return config_domain_type_python;
        default:
                /* Should not have an unknown domain */
                assert(0);
+               return NULL;
        }
 }
 
+LTTNG_HIDDEN
 const char *mi_lttng_buffertype_string(enum lttng_buffer_type value)
 {
        switch (value) {
@@ -323,22 +524,41 @@ const char *mi_lttng_buffertype_string(enum lttng_buffer_type value)
        default:
                /* Should not have an unknow buffer type */
                assert(0);
+               return NULL;
        }
 }
 
-const char *mi_lttng_calibratetype_string(enum lttng_calibrate_type val)
+LTTNG_HIDDEN
+const char *mi_lttng_rotation_state_string(enum lttng_rotation_state value)
 {
-       const char *ret;
+       switch (value) {
+       case LTTNG_ROTATION_STATE_ONGOING:
+               return mi_lttng_rotation_state_str_ongoing;
+       case LTTNG_ROTATION_STATE_COMPLETED:
+               return mi_lttng_rotation_state_str_completed;
+       case LTTNG_ROTATION_STATE_EXPIRED:
+               return mi_lttng_rotation_state_str_expired;
+       case LTTNG_ROTATION_STATE_ERROR:
+               return mi_lttng_rotation_state_str_error;
+       default:
+               /* Should not have an unknow rotation state. */
+               assert(0);
+               return NULL;
+       }
+}
 
-       switch (val) {
-       case LTTNG_CALIBRATE_FUNCTION:
-               ret = mi_lttng_element_calibrate_function;
-               break;
+LTTNG_HIDDEN
+const char *mi_lttng_trace_archive_location_relay_protocol_type_string(
+               enum lttng_trace_archive_location_relay_protocol_type value)
+{
+       switch (value) {
+       case LTTNG_TRACE_ARCHIVE_LOCATION_RELAY_PROTOCOL_TYPE_TCP:
+               return mi_lttng_rotation_location_relay_protocol_str_tcp;
        default:
-               ret = mi_lttng_element_empty;
-               break;
+               /* Should not have an unknow relay protocol. */
+               assert(0);
+               return NULL;
        }
-       return ret;
 }
 
 LTTNG_HIDDEN
@@ -352,7 +572,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;
                }
@@ -394,10 +614,42 @@ int mi_lttng_writer_command_open(struct mi_writer *writer, const char *command)
 {
        int ret;
 
-       ret = mi_lttng_writer_open_element(writer, mi_lttng_element_command);
+       /*
+        * A command is always the MI's root node, it must declare the current
+        * namespace and schema URIs and the schema's version.
+        */
+       ret = config_writer_open_element(writer->writer,
+                       mi_lttng_element_command);
+       if (ret) {
+               goto end;
+       }
+
+       ret = config_writer_write_attribute(writer->writer,
+                       mi_lttng_xmlns, DEFAULT_LTTNG_MI_NAMESPACE);
+       if (ret) {
+               goto end;
+       }
+
+       ret = config_writer_write_attribute(writer->writer,
+                       mi_lttng_xmlns_xsi, mi_lttng_w3_schema_uri);
+       if (ret) {
+               goto end;
+       }
+
+       ret = config_writer_write_attribute(writer->writer,
+                       mi_lttng_schema_location,
+                       mi_lttng_schema_location_uri);
+       if (ret) {
+               goto end;
+       }
+
+       ret = config_writer_write_attribute(writer->writer,
+                       mi_lttng_schema_version,
+                       mi_lttng_schema_version_value);
        if (ret) {
                goto end;
        }
+
        ret = mi_lttng_writer_write_element_string(writer,
                        mi_lttng_element_command_name, command);
 end:
@@ -489,7 +741,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 +913,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 */
@@ -729,9 +985,35 @@ int mi_lttng_channel_attr(struct mi_writer *writer,
                struct lttng_channel_attr *attr)
 {
        int ret = 0;
+       struct lttng_channel *chan = caa_container_of(attr,
+                       struct lttng_channel, attr);
+       uint64_t discarded_events, lost_packets, monitor_timer_interval;
+       int64_t blocking_timeout;
 
        assert(attr);
 
+       ret = lttng_channel_get_discarded_event_count(chan, &discarded_events);
+       if (ret) {
+               goto end;
+       }
+
+       ret = lttng_channel_get_lost_packet_count(chan, &lost_packets);
+       if (ret) {
+               goto end;
+       }
+
+       ret = lttng_channel_get_monitor_timer_interval(chan,
+                       &monitor_timer_interval);
+       if (ret) {
+               goto end;
+       }
+
+       ret = lttng_channel_get_blocking_timeout(chan,
+                       &blocking_timeout);
+       if (ret) {
+               goto end;
+       }
+
        /* Opening Attributes */
        ret = mi_lttng_writer_open_element(writer, config_element_attributes);
        if (ret) {
@@ -778,6 +1060,22 @@ int mi_lttng_channel_attr(struct mi_writer *writer,
                goto end;
        }
 
+       /* Monitor timer interval in usec */
+       ret = mi_lttng_writer_write_element_unsigned_int(writer,
+               config_element_monitor_timer_interval,
+               monitor_timer_interval);
+       if (ret) {
+               goto end;
+       }
+
+       /* Retry timeout in usec */
+       ret = mi_lttng_writer_write_element_signed_int(writer,
+               config_element_blocking_timeout,
+               blocking_timeout);
+       if (ret) {
+               goto end;
+       }
+
        /* Event output */
        ret = mi_lttng_writer_write_element_string(writer,
                config_element_output_type,
@@ -810,6 +1108,22 @@ int mi_lttng_channel_attr(struct mi_writer *writer,
                goto end;
        }
 
+       /* Discarded events */
+       ret = mi_lttng_writer_write_element_unsigned_int(writer,
+               config_element_discarded_events,
+               discarded_events);
+       if (ret) {
+               goto end;
+       }
+
+       /* Lost packets */
+       ret = mi_lttng_writer_write_element_unsigned_int(writer,
+               config_element_lost_packets,
+               lost_packets);
+       if (ret) {
+               goto end;
+       }
+
        /* Closing attributes */
        ret = mi_lttng_writer_close_element(writer);
        if (ret) {
@@ -825,6 +1139,7 @@ int mi_lttng_event_common_attributes(struct mi_writer *writer,
                struct lttng_event *event)
 {
        int ret;
+       const char *filter_expression;
 
        /* Open event element */
        ret = mi_lttng_writer_open_element(writer, config_element_event);
@@ -853,9 +1168,65 @@ int mi_lttng_event_common_attributes(struct mi_writer *writer,
                goto end;
        }
 
-       /* Event filter enabled? */
-       ret = mi_lttng_writer_write_element_bool(writer,
-                       config_element_filter, event->filter);
+       /* Event filter expression */
+       ret = lttng_event_get_filter_expression(event, &filter_expression);
+       if (ret) {
+               goto end;
+       }
+
+       if (filter_expression) {
+               ret = mi_lttng_writer_write_element_string(writer,
+                               config_element_filter_expression,
+                               filter_expression);
+               if (ret) {
+                       goto end;
+               }
+       }
+
+end:
+       return ret;
+}
+
+static int write_event_exclusions(struct mi_writer *writer,
+               struct lttng_event *event)
+{
+       int i;
+       int ret;
+       int exclusion_count;
+
+       /* Open event exclusions */
+       ret = mi_lttng_writer_open_element(writer, config_element_exclusions);
+       if (ret) {
+               goto end;
+       }
+
+       exclusion_count = lttng_event_get_exclusion_name_count(event);
+       if (exclusion_count < 0) {
+               ret = exclusion_count;
+               goto end;
+       }
+
+       for (i = 0; i < exclusion_count; i++) {
+               const char *name;
+
+               ret = lttng_event_get_exclusion_name(event, i, &name);
+               if (ret) {
+                       /* Close exclusions */
+                       mi_lttng_writer_close_element(writer);
+                       goto end;
+               }
+
+               ret = mi_lttng_writer_write_element_string(writer,
+                               config_element_exclusion, name);
+               if (ret) {
+                       /* Close exclusions */
+                       mi_lttng_writer_close_element(writer);
+                       goto end;
+               }
+       }
+
+       /* Close exclusions */
+       ret = mi_lttng_writer_close_element(writer);
 
 end:
        return ret;
@@ -863,13 +1234,14 @@ end:
 
 LTTNG_HIDDEN
 int mi_lttng_event_tracepoint_loglevel(struct mi_writer *writer,
-               struct lttng_event *event)
+               struct lttng_event *event, enum lttng_domain_type domain)
 {
        int ret;
 
        /* Event loglevel */
        ret = mi_lttng_writer_write_element_string(writer,
-                       config_element_loglevel, mi_lttng_loglevel_string(event->loglevel));
+                       config_element_loglevel,
+                       mi_lttng_loglevel_string(event->loglevel, domain));
        if (ret) {
                goto end;
        }
@@ -882,12 +1254,8 @@ int mi_lttng_event_tracepoint_loglevel(struct mi_writer *writer,
                goto end;
        }
 
-       /* event exclusion filter */
-       ret = mi_lttng_writer_write_element_bool(writer,
-                       config_element_exclusion, event->exclusion);
-       if (ret) {
-               goto end;
-       }
+       /* Event exclusions */
+       ret = write_event_exclusions(writer, event);
 
 end:
        return ret;
@@ -898,8 +1266,7 @@ int mi_lttng_event_tracepoint_no_loglevel(struct mi_writer *writer,
                struct lttng_event *event)
 {
        /* event exclusion filter */
-       return mi_lttng_writer_write_element_bool(writer,
-                       config_element_exclusion, event->exclusion);
+       return write_event_exclusions(writer, event);
 }
 
 LTTNG_HIDDEN
@@ -908,6 +1275,16 @@ int mi_lttng_event_function_probe(struct mi_writer *writer,
 {
        int ret;
 
+       ret = mi_lttng_writer_open_element(writer, config_element_attributes);
+       if (ret) {
+               goto end;
+       }
+
+       ret = mi_lttng_writer_open_element(writer, config_element_probe_attributes);
+       if (ret) {
+               goto end;
+       }
+
        if (event->attr.probe.addr != 0) {
                /* event probe address */
                ret = mi_lttng_writer_write_element_unsigned_int(writer,
@@ -930,6 +1307,144 @@ int mi_lttng_event_function_probe(struct mi_writer *writer,
                        goto end;
                }
        }
+
+       /* Close probe_attributes and attributes */
+       ret = mi_lttng_close_multi_element(writer, 2);
+end:
+       return ret;
+}
+
+static
+int mi_lttng_event_userspace_probe(struct mi_writer *writer,
+               struct lttng_event *event)
+{
+       int ret;
+       const struct lttng_userspace_probe_location *location;
+       const struct lttng_userspace_probe_location_lookup_method *lookup_method;
+       enum lttng_userspace_probe_location_lookup_method_type lookup_type;
+
+       location = lttng_event_get_userspace_probe_location(event);
+       if (!location) {
+               ret = -LTTNG_ERR_INVALID;
+               goto end;
+       }
+
+       lookup_method = lttng_userspace_probe_location_get_lookup_method(location);
+       if (!lookup_method) {
+               ret = -LTTNG_ERR_INVALID;
+               goto end;
+       }
+
+       lookup_type = lttng_userspace_probe_location_lookup_method_get_type(lookup_method);
+
+       ret = mi_lttng_writer_open_element(writer, config_element_attributes);
+       if (ret) {
+               goto end;
+       }
+
+       switch (lttng_userspace_probe_location_get_type(location)) {
+       case LTTNG_USERSPACE_PROBE_LOCATION_TYPE_FUNCTION:
+       {
+               const char *function_name;
+               const char *binary_path;
+
+               ret = mi_lttng_writer_open_element(writer,
+                               config_element_userspace_probe_function_attributes);
+               if (ret) {
+                       goto end;
+               }
+
+               switch (lookup_type) {
+               case LTTNG_USERSPACE_PROBE_LOCATION_LOOKUP_METHOD_TYPE_FUNCTION_ELF:
+                       ret = mi_lttng_writer_write_element_string(writer,
+                                       config_element_userspace_probe_lookup,
+                                       config_element_userspace_probe_lookup_function_elf);
+                       if (ret) {
+                               goto end;
+                       }
+                       break;
+               case LTTNG_USERSPACE_PROBE_LOCATION_LOOKUP_METHOD_TYPE_FUNCTION_DEFAULT:
+                       ret = mi_lttng_writer_write_element_string(writer,
+                                       config_element_userspace_probe_lookup,
+                                       config_element_userspace_probe_lookup_function_default);
+                       if (ret) {
+                               goto end;
+                       }
+                       break;
+               default:
+                       goto end;
+               }
+
+               binary_path = lttng_userspace_probe_location_function_get_binary_path(location);
+               ret = mi_lttng_writer_write_element_string(writer,
+                               config_element_userspace_probe_location_binary_path, binary_path);
+               if (ret) {
+                       goto end;
+               }
+
+               function_name = lttng_userspace_probe_location_function_get_function_name(location);
+               ret = mi_lttng_writer_write_element_string(writer,
+                               config_element_userspace_probe_function_location_function_name,
+                               function_name);
+               if (ret) {
+                       goto end;
+               }
+
+               break;
+       }
+       case LTTNG_USERSPACE_PROBE_LOCATION_TYPE_TRACEPOINT:
+       {
+               const char *probe_name, *provider_name;
+               const char *binary_path;
+
+               ret = mi_lttng_writer_open_element(writer,
+                               config_element_userspace_probe_function_attributes);
+               if (ret) {
+                       goto end;
+               }
+
+               switch (lookup_type) {
+               case LTTNG_USERSPACE_PROBE_LOCATION_LOOKUP_METHOD_TYPE_TRACEPOINT_SDT:
+                       ret = mi_lttng_writer_write_element_string(writer,
+                                       config_element_userspace_probe_lookup,
+                                       config_element_userspace_probe_lookup_tracepoint_sdt);
+                       if (ret) {
+                               goto end;
+                       }
+                       break;
+               default:
+                       goto end;
+               }
+
+               binary_path = lttng_userspace_probe_location_tracepoint_get_binary_path(location);
+               ret = mi_lttng_writer_write_element_string(writer,
+                               config_element_userspace_probe_location_binary_path,
+                               binary_path);
+               if (ret) {
+                       goto end;
+               }
+
+               provider_name = lttng_userspace_probe_location_tracepoint_get_provider_name(location);
+               ret = mi_lttng_writer_write_element_string(writer,
+                               config_element_userspace_probe_tracepoint_location_provider_name,
+                               provider_name);
+               if (ret) {
+                       goto end;
+               }
+
+               probe_name = lttng_userspace_probe_location_tracepoint_get_probe_name(location);
+               ret = mi_lttng_writer_write_element_string(writer,
+                               config_element_userspace_probe_tracepoint_location_probe_name, probe_name);
+               if (ret) {
+                       goto end;
+               }
+               break;
+       }
+       default:
+               ERR("Invalid probe type encountered");
+       }
+       /* Close probe_attributes and attributes */
+       ret = mi_lttng_close_multi_element(writer, 2);
 end:
        return ret;
 }
@@ -938,9 +1453,29 @@ LTTNG_HIDDEN
 int mi_lttng_event_function_entry(struct mi_writer *writer,
                struct lttng_event *event)
 {
+       int ret;
+
+       ret = mi_lttng_writer_open_element(writer, config_element_attributes);
+       if (ret) {
+               goto end;
+       }
+
+       ret = mi_lttng_writer_open_element(writer, config_element_probe_attributes);
+       if (ret) {
+               goto end;
+       }
+
        /* event probe symbol_name */
-       return mi_lttng_writer_write_element_string(writer,
+       ret = mi_lttng_writer_write_element_string(writer,
                        config_element_symbol_name, event->attr.ftrace.symbol_name);
+       if (ret) {
+               goto end;
+       }
+
+       /* Close function_attributes and attributes */
+       ret = mi_lttng_close_multi_element(writer, 2);
+end:
+       return ret;
 }
 
 LTTNG_HIDDEN
@@ -951,7 +1486,7 @@ int mi_lttng_events_open(struct mi_writer *writer)
 
 LTTNG_HIDDEN
 int mi_lttng_event(struct mi_writer *writer,
-               struct lttng_event *event, int is_open)
+               struct lttng_event *event, int is_open, enum lttng_domain_type domain)
 {
        int ret;
 
@@ -964,24 +1499,33 @@ int mi_lttng_event(struct mi_writer *writer,
        case LTTNG_EVENT_TRACEPOINT:
        {
                if (event->loglevel != -1) {
-                       ret = mi_lttng_event_tracepoint_loglevel(writer, event);
+                       ret = mi_lttng_event_tracepoint_loglevel(writer, event, domain);
                } else {
                        ret = mi_lttng_event_tracepoint_no_loglevel(writer, event);
                }
                break;
        }
+       case LTTNG_EVENT_FUNCTION:
+               /* Fallthrough */
        case LTTNG_EVENT_PROBE:
                ret = mi_lttng_event_function_probe(writer, event);
                break;
        case LTTNG_EVENT_FUNCTION_ENTRY:
                ret = mi_lttng_event_function_entry(writer, event);
                break;
+       case LTTNG_EVENT_USERSPACE_PROBE:
+               ret = mi_lttng_event_userspace_probe(writer, event);
+               break;
        case LTTNG_EVENT_ALL:
                /* Fallthrough */
        default:
                break;
        }
 
+       if (ret) {
+               goto end;
+       }
+
        if (!is_open) {
                ret = mi_lttng_writer_close_element(writer);
        }
@@ -991,37 +1535,66 @@ end:
 }
 
 LTTNG_HIDDEN
-int mi_lttng_pids_open(struct mi_writer *writer)
+int mi_lttng_trackers_open(struct mi_writer *writer)
 {
-       return mi_lttng_writer_open_element(writer, mi_lttng_element_pids);
+       return mi_lttng_writer_open_element(writer, config_element_trackers);
 }
 
 LTTNG_HIDDEN
-int mi_lttng_pid(struct mi_writer *writer, pid_t pid , const char *cmdline,
-               int is_open)
+int mi_lttng_pid_tracker_open(struct mi_writer *writer)
 {
        int ret;
 
-       /* Open element pid */
-       ret = mi_lttng_writer_open_element(writer, mi_lttng_element_pid);
+       /* Open element pid_tracker */
+       ret = mi_lttng_writer_open_element(writer, config_element_pid_tracker);
        if (ret) {
                goto end;
        }
 
-       /* Writing pid number */
-       ret = mi_lttng_writer_write_element_signed_int(writer,
-                       mi_lttng_element_pid_id, (int)pid);
-       if (ret) {
-               goto end;
-       }
+       /* Open targets element */
+       ret = mi_lttng_targets_open(writer);
+end:
+       return ret;
+}
 
-       /* Writing name of the process */
-       ret = mi_lttng_writer_write_element_string(writer, config_element_name,
-                       cmdline);
+LTTNG_HIDDEN
+int mi_lttng_pids_open(struct mi_writer *writer)
+{
+       return mi_lttng_writer_open_element(writer, config_element_pids);
+}
+
+/*
+ * TODO: move the listing of pid for user agent to process semantic on
+ * mi api bump. The use of process element break the mi api.
+ */
+LTTNG_HIDDEN
+int mi_lttng_pid(struct mi_writer *writer, pid_t pid , const char *name,
+               int is_open)
+{
+       int ret;
+
+       /* Open pid process */
+       ret = mi_lttng_writer_open_element(writer, config_element_pid);
+       if (ret) {
+               goto end;
+       }
+
+       /* Writing pid number */
+       ret = mi_lttng_writer_write_element_signed_int(writer,
+                       mi_lttng_element_pid_id, (int)pid);
        if (ret) {
                goto end;
        }
 
+       /* Writing name of the process */
+       if (name) {
+               ret = mi_lttng_writer_write_element_string(writer, config_element_name,
+                               name);
+               if (ret) {
+                       goto end;
+               }
+       }
+
        if (!is_open) {
                /* Closing Pid */
                ret = mi_lttng_writer_close_element(writer);
@@ -1031,6 +1604,51 @@ end:
        return ret;
 }
 
+LTTNG_HIDDEN
+int mi_lttng_targets_open(struct mi_writer *writer)
+{
+       return mi_lttng_writer_open_element(writer,
+                       config_element_targets);
+}
+
+LTTNG_HIDDEN
+int mi_lttng_pid_target(struct mi_writer *writer, pid_t pid, int is_open)
+{
+       int ret;
+
+       ret = mi_lttng_writer_open_element(writer,
+                       config_element_target_pid);
+       if (ret) {
+               goto end;
+       }
+
+       /* Writing pid number
+        * Special case for element all on track untrack command
+        * All pid is represented as wildcard *
+        */
+       if ((int) pid == -1) {
+               ret = mi_lttng_writer_write_element_string(writer,
+                               config_element_pid,
+                               mi_lttng_element_track_untrack_all_wildcard);
+       } else {
+               ret = mi_lttng_writer_write_element_signed_int(writer,
+                               config_element_pid, (int) pid);
+       }
+       if (ret) {
+               goto end;
+       }
+
+       if (!is_open) {
+               ret = mi_lttng_writer_close_element(writer);
+               if (ret) {
+                       goto end;
+               }
+       }
+
+end:
+       return ret;
+}
+
 LTTNG_HIDDEN
 int mi_lttng_event_fields_open(struct mi_writer *writer)
 {
@@ -1088,67 +1706,131 @@ end:
 }
 
 LTTNG_HIDDEN
-int mi_lttng_calibrate(struct mi_writer *writer,
-               struct lttng_calibrate *calibrate)
+int mi_lttng_perf_counter_context(struct mi_writer *writer,
+               struct lttng_event_perf_counter_ctx  *perf_context)
 {
        int ret;
 
-       /* Open calibrate element */
-       ret = mi_lttng_writer_open_element(writer, mi_lttng_element_calibrate);
+       /* Open perf_counter_context */
+       ret = mi_lttng_writer_open_element(writer,
+                       mi_lttng_element_perf_counter_context);
        if (ret) {
                goto end;
        }
 
-       /* Calibration type */
-       ret = mi_lttng_writer_write_element_string(writer, config_element_type,
-                       mi_lttng_calibratetype_string(calibrate->type));
+       /* Type */
+       ret = mi_lttng_writer_write_element_unsigned_int(writer,
+                       config_element_type, perf_context->type);
+       if (ret) {
+               goto end;
+       }
+
+       /* Config */
+       ret = mi_lttng_writer_write_element_unsigned_int(writer,
+                       config_element_config, perf_context->config);
        if (ret) {
                goto end;
        }
 
-       /* Closing calibrate element */
+       /* Name of the perf counter */
+       ret = mi_lttng_writer_write_element_string(writer,
+                       config_element_name, perf_context->name);
+       if (ret) {
+               goto end;
+       }
+
+       /* Close perf_counter_context */
        ret = mi_lttng_writer_close_element(writer);
 end:
        return ret;
 }
+
+static
+int mi_lttng_app_context(struct mi_writer *writer,
+               const char *provider_name, const char *ctx_name)
+{
+       int ret;
+
+       /* Open app */
+       ret = mi_lttng_writer_open_element(writer,
+                       config_element_context_app);
+       if (ret) {
+               goto end;
+       }
+
+       /* provider_name */
+       ret = mi_lttng_writer_write_element_string(writer,
+                       config_element_context_app_provider_name,
+                       provider_name);
+       if (ret) {
+               goto end;
+       }
+
+       /* ctx_name */
+       ret = mi_lttng_writer_write_element_string(writer,
+                       config_element_context_app_ctx_name, ctx_name);
+       if (ret) {
+               goto end;
+       }
+
+       /* Close app */
+       ret = mi_lttng_writer_close_element(writer);
+end:
+       return ret;
+}
+
 LTTNG_HIDDEN
 int mi_lttng_context(struct mi_writer *writer,
                struct lttng_event_context *context, int is_open)
 {
        int ret;
-       const char *type_string;
-       struct lttng_event_perf_counter_ctx *perf_context;
+
        /* Open context */
        ret = mi_lttng_writer_open_element(writer , config_element_context);
        if (ret) {
                goto end;
        }
 
-       type_string = mi_lttng_event_contexttype_string(context->ctx);
-       if (!type_string) {
-               ret = -LTTNG_ERR_INVALID;
-               goto end;
-       }
-
-       /* Print context type */
-       ret = mi_lttng_writer_write_element_string(writer, config_element_type,
-                       type_string);
-
        /* Special case for PERF_*_COUNTER
         * print the lttng_event_perf_counter_ctx*/
        switch (context->ctx) {
        case LTTNG_EVENT_CONTEXT_PERF_COUNTER:
        case LTTNG_EVENT_CONTEXT_PERF_THREAD_COUNTER:
        case LTTNG_EVENT_CONTEXT_PERF_CPU_COUNTER:
-               perf_context = &context->u.perf_counter;
+       {
+               struct lttng_event_perf_counter_ctx *perf_context =
+                               &context->u.perf_counter;
                ret =  mi_lttng_perf_counter_context(writer, perf_context);
                if (ret) {
                        goto end;
                }
                break;
+       }
+       case LTTNG_EVENT_CONTEXT_APP_CONTEXT:
+       {
+               ret = mi_lttng_app_context(writer,
+                               context->u.app_ctx.provider_name,
+                               context->u.app_ctx.ctx_name);
+               if (ret) {
+                       goto end;
+               }
+               break;
+       }
        default:
+       {
+               const char *type_string = mi_lttng_event_contexttype_string(
+                               context->ctx);
+               if (!type_string) {
+                       ret = -LTTNG_ERR_INVALID;
+                       goto end;
+               }
+
+               /* Print context type */
+               ret = mi_lttng_writer_write_element_string(writer,
+                               config_element_type, type_string);
                break;
        }
+       }
 
        /* Close context */
        if (!is_open) {
@@ -1159,46 +1841,6 @@ end:
        return ret;
 }
 
-LTTNG_HIDDEN
-int mi_lttng_perf_counter_context(struct mi_writer *writer,
-               struct lttng_event_perf_counter_ctx  *perf_context)
-{
-       int ret;
-
-       /* Open perf_counter_context */
-       ret = mi_lttng_writer_open_element(writer,
-                       mi_lttng_element_perf_counter_context);
-       if (ret) {
-               goto end;
-       }
-
-       /* Type */
-       ret = mi_lttng_writer_write_element_unsigned_int(writer,
-                       config_element_type, perf_context->type);
-       if (ret) {
-               goto end;
-       }
-
-       /* Config */
-       ret = mi_lttng_writer_write_element_unsigned_int(writer,
-                       config_element_config, perf_context->config);
-       if (ret) {
-               goto end;
-       }
-
-       /* Name of the perf counter */
-       ret = mi_lttng_writer_write_element_string(writer,
-                       config_element_name, perf_context->name);
-       if (ret) {
-               goto end;
-       }
-
-       /* Close perf_counter_context */
-       ret = mi_lttng_writer_close_element(writer);
-end:
-       return ret;
-}
-
 LTTNG_HIDDEN
 int mi_lttng_snapshot_output_session_name(struct mi_writer *writer,
                const char *session_name)
@@ -1214,6 +1856,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);
@@ -1433,3 +2078,309 @@ int mi_lttng_snapshot_record(struct mi_writer *writer,
 end:
        return ret;
 }
+
+LTTNG_HIDDEN
+int mi_lttng_rotation_schedule(struct mi_writer *writer,
+               const struct lttng_rotation_schedule *schedule)
+{
+       int ret = 0;
+       enum lttng_rotation_status status;
+       uint64_t value;
+       const char *element_name;
+       const char *value_name;
+       bool empty_schedule = false;
+
+       switch (lttng_rotation_schedule_get_type(schedule)) {
+       case LTTNG_ROTATION_SCHEDULE_TYPE_PERIODIC:
+               status = lttng_rotation_schedule_periodic_get_period(schedule,
+                               &value);
+               element_name = mi_lttng_element_rotation_schedule_periodic;
+               value_name = mi_lttng_element_rotation_schedule_periodic_time_us;
+               break;
+       case LTTNG_ROTATION_SCHEDULE_TYPE_SIZE_THRESHOLD:
+               status = lttng_rotation_schedule_size_threshold_get_threshold(
+                               schedule, &value);
+               element_name = mi_lttng_element_rotation_schedule_size_threshold;
+               value_name = mi_lttng_element_rotation_schedule_size_threshold_bytes;
+               break;
+       default:
+               ret = -1;
+               goto end;
+       }
+
+       if (status != LTTNG_ROTATION_STATUS_OK) {
+               if (status == LTTNG_ROTATION_STATUS_UNAVAILABLE) {
+                       empty_schedule = true;
+               } else {
+                       ret = -1;
+                       goto end;
+               }
+       }
+
+       ret = mi_lttng_writer_open_element(writer, element_name);
+       if (ret) {
+               goto end;
+       }
+
+       if (!empty_schedule) {
+               ret = mi_lttng_writer_write_element_unsigned_int(writer,
+                               value_name, value);
+               if (ret) {
+                       goto end;
+               }
+       }
+
+       /* Close schedule descriptor element. */
+       ret = mi_lttng_writer_close_element(writer);
+       if (ret) {
+               goto end;
+       }
+end:
+       return ret;
+}
+
+LTTNG_HIDDEN
+int mi_lttng_rotation_schedule_result(struct mi_writer *writer,
+               const struct lttng_rotation_schedule *schedule,
+               bool success)
+{
+       int ret = 0;
+
+       ret = mi_lttng_writer_open_element(writer,
+                       mi_lttng_element_rotation_schedule_result);
+       if (ret) {
+               goto end;
+       }
+
+       ret = mi_lttng_writer_open_element(writer,
+                       mi_lttng_element_rotation_schedule);
+       if (ret) {
+               goto end;
+       }
+
+       ret = mi_lttng_rotation_schedule(writer, schedule);
+       if (ret) {
+               goto end;
+       }
+
+       /* Close rotation_schedule element */
+       ret = mi_lttng_writer_close_element(writer);
+       if (ret) {
+               goto end;
+       }
+
+       ret = mi_lttng_writer_write_element_bool(writer,
+                       mi_lttng_element_command_success, success);
+       if (ret) {
+               goto end;
+       }
+
+       /* Close rotation_schedule_result element */
+        ret = mi_lttng_writer_close_element(writer);
+       if (ret) {
+               goto end;
+       }
+end:
+       return ret;
+}
+
+static
+int mi_lttng_location(struct mi_writer *writer,
+               const struct lttng_trace_archive_location *location)
+{
+       int ret = 0;
+       enum lttng_trace_archive_location_type location_type;
+       enum lttng_trace_archive_location_status status;
+
+       location_type = lttng_trace_archive_location_get_type(location);
+
+       switch (location_type) {
+       case LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_LOCAL:
+       {
+               const char *absolute_path;
+
+               status = lttng_trace_archive_location_local_get_absolute_path(
+                               location, &absolute_path);
+               if (status != LTTNG_TRACE_ARCHIVE_LOCATION_STATUS_OK) {
+                       ret = -1;
+                       goto end;
+               }
+
+               ret = mi_lttng_writer_open_element(writer,
+                               mi_lttng_element_rotation_location_local);
+               if (ret) {
+                       goto end;
+               }
+
+
+               ret = mi_lttng_writer_write_element_string(writer,
+                               mi_lttng_element_rotation_location_local_absolute_path,
+                               absolute_path);
+               if (ret) {
+                       goto end;
+               }
+
+               /* Close local element */
+               ret = mi_lttng_writer_close_element(writer);
+               if (ret) {
+                       goto end;
+               }
+               break;
+       }
+       case LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_RELAY:
+       {
+               uint16_t control_port, data_port;
+               const char *host, *relative_path;
+               enum lttng_trace_archive_location_relay_protocol_type protocol;
+
+               /* Fetch all relay location parameters. */
+               status = lttng_trace_archive_location_relay_get_protocol_type(
+                               location, &protocol);
+               if (status != LTTNG_TRACE_ARCHIVE_LOCATION_STATUS_OK) {
+                       ret = -1;
+                       goto end;
+               }
+
+               status = lttng_trace_archive_location_relay_get_host(
+                               location, &host);
+               if (status != LTTNG_TRACE_ARCHIVE_LOCATION_STATUS_OK) {
+                       ret = -1;
+                       goto end;
+               }
+
+               status = lttng_trace_archive_location_relay_get_control_port(
+                               location, &control_port);
+               if (status != LTTNG_TRACE_ARCHIVE_LOCATION_STATUS_OK) {
+                       ret = -1;
+                       goto end;
+               }
+
+               status = lttng_trace_archive_location_relay_get_data_port(
+                               location, &data_port);
+               if (status != LTTNG_TRACE_ARCHIVE_LOCATION_STATUS_OK) {
+                       ret = -1;
+                       goto end;
+               }
+
+               status = lttng_trace_archive_location_relay_get_relative_path(
+                               location, &relative_path);
+               if (status != LTTNG_TRACE_ARCHIVE_LOCATION_STATUS_OK) {
+                       ret = -1;
+                       goto end;
+               }
+
+               ret = mi_lttng_writer_open_element(writer,
+                               mi_lttng_element_rotation_location_relay);
+               if (ret) {
+                       goto end;
+               }
+
+               ret = mi_lttng_writer_write_element_string(writer,
+                               mi_lttng_element_rotation_location_relay_host,
+                               host);
+               if (ret) {
+                       goto end;
+               }
+
+               ret = mi_lttng_writer_write_element_unsigned_int(writer,
+                               mi_lttng_element_rotation_location_relay_control_port,
+                               control_port);
+               if (ret) {
+                       goto end;
+               }
+
+               ret = mi_lttng_writer_write_element_unsigned_int(writer,
+                               mi_lttng_element_rotation_location_relay_data_port,
+                               data_port);
+               if (ret) {
+                       goto end;
+               }
+
+               ret = mi_lttng_writer_write_element_string(writer,
+                               mi_lttng_element_rotation_location_relay_protocol,
+                               mi_lttng_trace_archive_location_relay_protocol_type_string(protocol));
+               if (ret) {
+                       goto end;
+               }
+
+               ret = mi_lttng_writer_write_element_string(writer,
+                               mi_lttng_element_rotation_location_relay_relative_path,
+                               relative_path);
+               if (ret) {
+                       goto end;
+               }
+
+               /* Close relay element */
+               ret = mi_lttng_writer_close_element(writer);
+               if (ret) {
+                       goto end;
+               }
+               break;
+       }
+       default:
+               abort();
+       }
+end:
+       return ret;
+}
+
+LTTNG_HIDDEN
+int mi_lttng_rotate(struct mi_writer *writer,
+               const char *session_name,
+               enum lttng_rotation_state rotation_state,
+               const struct lttng_trace_archive_location *location)
+{
+       int ret;
+
+       ret = mi_lttng_writer_open_element(writer,
+                       mi_lttng_element_rotation);
+       if (ret) {
+               goto end;
+       }
+
+       ret = mi_lttng_writer_write_element_string(writer,
+                       mi_lttng_element_session_name,
+                       session_name);
+       if (ret) {
+               goto end;
+       }
+
+       ret = mi_lttng_writer_write_element_string(writer,
+                       mi_lttng_element_rotation_state,
+                       mi_lttng_rotation_state_string(rotation_state));
+       if (ret) {
+               goto end;
+       }
+
+       if (!location) {
+               /* Not a serialization error. */
+               goto close_rotation;
+       }
+
+       ret = mi_lttng_writer_open_element(writer,
+                       mi_lttng_element_rotation_location);
+       if (ret) {
+               goto end;
+       }
+
+       ret = mi_lttng_location(writer, location);
+       if (ret) {
+               goto close_location;
+       }
+
+close_location:
+       /* Close location element */
+       ret = mi_lttng_writer_close_element(writer);
+       if (ret) {
+               goto end;
+       }
+       
+close_rotation:
+       /* Close rotation element */
+       ret = mi_lttng_writer_close_element(writer);
+       if (ret) {
+               goto end;
+       }
+end:
+       return ret;
+}
This page took 0.040484 seconds and 5 git commands to generate.