/*
* 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 <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_ns_uri = "http://lttng.org/xml/ns/lttng-mi";
+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 =
+ "http://lttng.org/xml/ns/lttng-mi" " "
+ "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_perf_counter_context = "perf_counter_context";
/* Strings related to pid */
-const char * const mi_lttng_element_processes = "processes";
-const char * const mi_lttng_element_process = "process";
+const char * const mi_lttng_element_pid_id = "id";
/* Strings related to save command */
const char * const mi_lttng_element_save = "save";
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, mi_lttng_ns_uri);
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 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_processes_open(struct mi_writer *writer)
-{
- return mi_lttng_writer_open_element(writer, mi_lttng_element_processes);
-}
-
-LTTNG_HIDDEN
-int mi_lttng_process(struct mi_writer *writer, pid_t pid , const char *name,
+int mi_lttng_pid(struct mi_writer *writer, pid_t pid , const char *name,
int is_open)
{
int ret;
- /* Open element process */
- ret = mi_lttng_writer_open_element(writer, mi_lttng_element_process);
+ /* 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,
- config_element_pid, (int)pid);
+ mi_lttng_element_pid_id, (int)pid);
if (ret) {
goto end;
}