#include <common/runas.h>
#include <lttng/save-internal.h>
+#include "kernel.h"
#include "save.h"
#include "session.h"
#include "syscall.h"
struct ltt_kernel_event *kevent;
/* Create a temporary kevent in order to save it. */
- kevent = trace_kernel_create_event(&events[i]);
+ /*
+ * TODO: struct lttng_event does not really work for a filter,
+ * but unfortunately, it is exposed as external API (and used as
+ * internal representation. Using NULL meanwhile.
+ */
+ kevent = trace_kernel_create_event(&events[i],
+ NULL, NULL);
if (!kevent) {
ret = -ENOMEM;
goto end;
return ret;
}
+static
+int save_pid_tracker(struct config_writer *writer,
+ struct ltt_session *sess, int domain)
+{
+ int ret = 0;
+ ssize_t nr_pids = 0, i;
+ int32_t *pids = NULL;
+
+ switch (domain) {
+ case LTTNG_DOMAIN_KERNEL:
+ {
+ nr_pids = kernel_list_tracker_pids(sess->kernel_session, &pids);
+ if (nr_pids < 0) {
+ ret = LTTNG_ERR_KERN_LIST_FAIL;
+ goto end;
+ }
+ break;
+ }
+ case LTTNG_DOMAIN_UST:
+ {
+ nr_pids = trace_ust_list_tracker_pids(sess->ust_session, &pids);
+ if (nr_pids < 0) {
+ ret = LTTNG_ERR_UST_LIST_FAIL;
+ goto end;
+ }
+ break;
+ }
+ case LTTNG_DOMAIN_JUL:
+ case LTTNG_DOMAIN_LOG4J:
+ case LTTNG_DOMAIN_PYTHON:
+ default:
+ ret = LTTNG_ERR_UNKNOWN_DOMAIN;
+ goto end;
+ }
+
+ /* Only create a pid_tracker if enabled or untrack all */
+ if (nr_pids != 1 || (nr_pids == 1 && pids[0] != -1)) {
+ ret = config_writer_open_element(writer,
+ config_element_pid_tracker);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ ret = config_writer_open_element(writer,
+ config_element_targets);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ for (i = 0; i < nr_pids; i++) {
+ ret = config_writer_open_element(writer,
+ config_element_target_pid);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ ret = config_writer_write_element_unsigned_int(writer,
+ config_element_pid, pids[i]);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ /* /pid_target */
+ ret = config_writer_close_element(writer);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+ }
+
+ /* /targets */
+ ret = config_writer_close_element(writer);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ /* /pid_tracker */
+ ret = config_writer_close_element(writer);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+ }
+end:
+ free(pids);
+ return ret;
+}
+
static
int save_domains(struct config_writer *writer, struct ltt_session *session)
{
goto end;
}
+ ret = config_writer_open_element(writer,
+ config_element_trackers);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ ret = save_pid_tracker(writer, session, LTTNG_DOMAIN_KERNEL);
+ if (ret) {
+ goto end;
+ }
+
+ /* /trackers */
+ ret = config_writer_close_element(writer);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
/* /domain */
ret = config_writer_close_element(writer);
if (ret) {
}
if (session->ust_session) {
+ unsigned long agent_count;
+
ret = config_writer_open_element(writer,
config_element_domain);
if (ret) {
goto end;
}
- /* /domain */
- ret = config_writer_close_element(writer);
+ ret = config_writer_open_element(writer,
+ config_element_trackers);
if (ret) {
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
- }
- if (session->ust_session &&
- lttng_ht_get_count(session->ust_session->agents) > 0) {
- ret = config_writer_open_element(writer,
- config_element_domain);
+ ret = save_pid_tracker(writer, session, LTTNG_DOMAIN_UST);
if (ret) {
- ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
- ret = save_ust_session(writer, session, 1);
+ /* /trackers */
+ ret = config_writer_close_element(writer);
if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
-
/* /domain */
ret = config_writer_close_element(writer);
if (ret) {
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
+
+ rcu_read_lock();
+ agent_count =
+ lttng_ht_get_count(session->ust_session->agents);
+ rcu_read_unlock();
+
+ if (agent_count > 0) {
+ ret = config_writer_open_element(writer,
+ config_element_domain);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ ret = save_ust_session(writer, session, 1);
+ if (ret) {
+ goto end;
+ }
+
+ /* /domain */
+ ret = config_writer_close_element(writer);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+ }
}
/* /domains */
goto end;
}
+ if(session->shm_path[0] != '\0') {
+ ret = config_writer_write_element_string(writer,
+ config_element_shared_memory_path,
+ session->shm_path);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+ }
+
ret = save_domains(writer, session);
if (ret) {
goto end;