/*
* 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.
*/
-#define _GNU_SOURCE
#define _LGPL_SOURCE
-#include <include/config.h>
-#include <common/config/config.h>
+#include <common/config/session-config.h>
+#include <common/defaults.h>
#include <lttng/snapshot-internal.h>
#include "mi-lttng.h"
#include <assert.h>
+#define MI_SCHEMA_MAJOR_VERSION 3
+#define MI_SCHEMA_MINOR_VERSION 0
+
+/* Machine interface namespace URI */
+const char * const mi_lttng_xmlns = "xmlns";
+const char * const mi_lttng_xmlns_xsi = "xmlns:xsi";
+const char * const mi_lttng_w3_schema_uri = "http://www.w3.org/2001/XMLSchema-instance";
+const char * const mi_lttng_schema_location = "xsi:schemaLocation";
+const char * const mi_lttng_schema_location_uri =
+ DEFAULT_LTTNG_MI_NAMESPACE " "
+ "http://lttng.org/xml/schemas/lttng-mi/" XSTR(MI_SCHEMA_MAJOR_VERSION)
+ "/lttng-mi-" XSTR(MI_SCHEMA_MAJOR_VERSION) "."
+ XSTR(MI_SCHEMA_MINOR_VERSION) ".xsd";
+const char * const mi_lttng_schema_version = "schemaVersion";
+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_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 */
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 */
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 = "*";
+
+
/* This is a merge of jul loglevel and regular loglevel
* Those should never overlap by definition
* (see struct lttng_event loglevel)
}
}
-LTTNG_HIDDEN
+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:
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;
}
}
default:
/* Should not have an unknow buffer type */
assert(0);
+ return NULL;
}
}
{
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:
struct lttng_event *event)
{
int ret;
+ const char *filter_expression;
/* Open event element */
ret = mi_lttng_writer_open_element(writer, config_element_event);
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_string(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;
return ret;
}
+LTTNG_HIDDEN
+int mi_lttng_trackers_open(struct mi_writer *writer)
+{
+ return mi_lttng_writer_open_element(writer, config_element_trackers);
+}
+
+LTTNG_HIDDEN
+int mi_lttng_pid_tracker_open(struct mi_writer *writer)
+{
+ int ret;
+
+ /* Open element pid_tracker */
+ ret = mi_lttng_writer_open_element(writer, config_element_pid_tracker);
+ if (ret) {
+ goto end;
+ }
+
+ /* Open targets element */
+ ret = mi_lttng_targets_open(writer);
+end:
+ return ret;
+}
+
LTTNG_HIDDEN
int mi_lttng_pids_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_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 *cmdline,
+int mi_lttng_pid(struct mi_writer *writer, pid_t pid , const char *name,
int is_open)
{
int ret;
- /* Open element pid */
- ret = mi_lttng_writer_open_element(writer, mi_lttng_element_pid);
+ /* Open pid process */
+ ret = mi_lttng_writer_open_element(writer, config_element_pid);
if (ret) {
goto end;
}
}
/* Writing name of the process */
- ret = mi_lttng_writer_write_element_string(writer, config_element_name,
- cmdline);
+ 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);
+ }
+
+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) {
- /* Closing Pid */
ret = mi_lttng_writer_close_element(writer);
+ if (ret) {
+ goto end;
+ }
}
end:
end:
return ret;
}
+
LTTNG_HIDDEN
-int mi_lttng_context(struct mi_writer *writer,
- struct lttng_event_context *context, int is_open)
+int mi_lttng_perf_counter_context(struct mi_writer *writer,
+ struct lttng_event_perf_counter_ctx *perf_context)
{
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);
+
+ /* Open perf_counter_context */
+ ret = mi_lttng_writer_open_element(writer,
+ mi_lttng_element_perf_counter_context);
if (ret) {
goto end;
}
- type_string = mi_lttng_event_contexttype_string(context->ctx);
- if (!type_string) {
- ret = -LTTNG_ERR_INVALID;
+ /* Type */
+ ret = mi_lttng_writer_write_element_unsigned_int(writer,
+ config_element_type, perf_context->type);
+ if (ret) {
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;
- ret = mi_lttng_perf_counter_context(writer, perf_context);
- if (ret) {
- goto end;
- }
- break;
- default:
- break;
+ /* Config */
+ ret = mi_lttng_writer_write_element_unsigned_int(writer,
+ config_element_config, perf_context->config);
+ if (ret) {
+ goto end;
}
- /* Close context */
- if (!is_open) {
- ret = mi_lttng_writer_close_element(writer);
+ /* 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_perf_counter_context(struct mi_writer *writer,
- struct lttng_event_perf_counter_ctx *perf_context)
+static
+int mi_lttng_app_context(struct mi_writer *writer,
+ const char *provider_name, const char *ctx_name)
{
int ret;
- /* Open perf_counter_context */
+ /* Open app */
ret = mi_lttng_writer_open_element(writer,
- mi_lttng_element_perf_counter_context);
+ config_element_context_app);
if (ret) {
goto end;
}
- /* Type */
- ret = mi_lttng_writer_write_element_unsigned_int(writer,
- config_element_type, perf_context->type);
+ /* provider_name */
+ ret = mi_lttng_writer_write_element_string(writer,
+ config_element_context_app_provider_name,
+ provider_name);
if (ret) {
goto end;
}
- /* Config */
- ret = mi_lttng_writer_write_element_unsigned_int(writer,
- config_element_config, perf_context->config);
+ /* ctx_name */
+ ret = mi_lttng_writer_write_element_string(writer,
+ config_element_context_app_ctx_name, ctx_name);
if (ret) {
goto end;
}
- /* Name of the perf counter */
- ret = mi_lttng_writer_write_element_string(writer,
- config_element_name, perf_context->name);
+ /* 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;
+
+ /* Open context */
+ ret = mi_lttng_writer_open_element(writer , config_element_context);
if (ret) {
goto end;
}
- /* Close perf_counter_context */
- ret = mi_lttng_writer_close_element(writer);
+ /* 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:
+ {
+ 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) {
+ ret = mi_lttng_writer_close_element(writer);
+ }
+
end:
return ret;
}