Support syscall event in save session

[lttng-tools.git] / src / bin / lttng-sessiond / save.c

diff --git a/src/bin/lttng-sessiond/save.c b/src/bin/lttng-sessiond/save.c
index fe5461cb1e34f30fbd43b9c3b3018e28c6adc783..d3fb7b8f3f1dd8816a11a3d914488dfc8cbcb7e5 100644 (file)
--- a/src/bin/lttng-sessiond/save.c
+++ b/src/bin/lttng-sessiond/save.c
@@ -25,13 +25,13 @@
 #include <common/defaults.h>
 #include <common/error.h>
 #include <common/config/config.h>
-#include <common/config/config-session-internal.h>
 #include <common/utils.h>
 #include <common/runas.h>
 #include <lttng/save-internal.h>
 
 #include "save.h"
 #include "session.h"
+#include "syscall.h"
 #include "trace-ust.h"
 
 static
@@ -259,8 +259,12 @@ const char *get_ust_context_type_string(
        case LTTNG_UST_CONTEXT_PTHREAD_ID:
                context_type_string = config_event_context_pthread_id;
                break;
+       case LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER:
+               context_type_string = config_event_context_perf_thread_counter;
+               break;
        default:
                context_type_string = NULL;
+               break;
        }
 
        return context_type_string;
@@ -367,6 +371,7 @@ int save_kernel_event(struct config_writer *writer,
                }
 
                switch (event->event->instrumentation) {
+               case LTTNG_KERNEL_SYSCALL:
                case LTTNG_KERNEL_FUNCTION:
                        ret = config_writer_open_element(writer,
                                config_element_function_attributes);
@@ -480,9 +485,54 @@ end:
        return ret;
 }
 
+static
+int save_kernel_syscall(struct config_writer *writer,
+               struct ltt_kernel_channel *kchan)
+{
+       int ret, i;
+       ssize_t count;
+       struct lttng_event *events = NULL;
+
+       assert(writer);
+       assert(kchan);
+
+       count = syscall_list_channel(kchan, &events, 0);
+       if (!count) {
+               /* No syscalls, just gracefully return. */
+               ret = 0;
+               goto end;
+       }
+
+       for (i = 0; i < count; i++) {
+               struct ltt_kernel_event *kevent;
+
+               /* Create a temporary kevent in order to save it. */
+               kevent = trace_kernel_create_event(&events[i]);
+               if (!kevent) {
+                       ret = -ENOMEM;
+                       goto end;
+               }
+               /* Init list in order so the destroy call can del the node. */
+               CDS_INIT_LIST_HEAD(&kevent->list);
+
+               ret = save_kernel_event(writer, kevent);
+               trace_kernel_destroy_event(kevent);
+               if (ret) {
+                       goto end;
+               }
+       }
+
+       /* Everything went well */
+       ret = 0;
+
+end:
+       free(events);
+       return ret;
+}
+
 static
 int save_kernel_events(struct config_writer *writer,
-       struct ltt_kernel_event_list *event_list)
+       struct ltt_kernel_channel *kchan)
 {
        int ret;
        struct ltt_kernel_event *event;
@@ -493,13 +543,19 @@ int save_kernel_events(struct config_writer *writer,
                goto end;
        }
 
-       cds_list_for_each_entry(event, &event_list->head, list) {
+       cds_list_for_each_entry(event, &kchan->events_list.head, list) {
                ret = save_kernel_event(writer, event);
                if (ret) {
                        goto end;
                }
        }
 
+       /* Save syscalls if any. */
+       ret = save_kernel_syscall(writer, kchan);
+       if (ret) {
+               goto end;
+       }
+
        /* /events */
        ret = config_writer_close_element(writer);
        if (ret) {
@@ -667,19 +723,13 @@ int save_kernel_context(struct config_writer *writer,
                goto end;
        }
 
-       ret = config_writer_open_element(writer, config_element_contexts);
-       if (ret) {
-               ret = LTTNG_ERR_SAVE_IO_FAIL;
-               goto end;
-       }
-
        ret = config_writer_open_element(writer, config_element_context);
        if (ret) {
                ret = LTTNG_ERR_SAVE_IO_FAIL;
                goto end;
        }
 
-       if (ctx->ctx == LTTNG_KERNEL_CONTEXT_PERF_COUNTER) {
+       if (ctx->ctx == LTTNG_KERNEL_CONTEXT_PERF_CPU_COUNTER) {
                ret = config_writer_open_element(writer, config_element_perf);
                if (ret) {
                        ret = LTTNG_ERR_SAVE_IO_FAIL;
@@ -738,6 +788,30 @@ int save_kernel_context(struct config_writer *writer,
                goto end;
        }
 
+end:
+       return ret;
+}
+
+static
+int save_kernel_contexts(struct config_writer *writer,
+               struct ltt_kernel_channel *kchan)
+{
+       int ret;
+       struct ltt_kernel_context *ctx;
+
+       ret = config_writer_open_element(writer, config_element_contexts);
+       if (ret) {
+               ret = LTTNG_ERR_SAVE_IO_FAIL;
+               goto end;
+       }
+
+       cds_list_for_each_entry(ctx, &kchan->ctx_list, list) {
+               ret = save_kernel_context(writer, &ctx->ctx);
+               if (ret) {
+                       goto end;
+               }
+       }
+
        /* /contexts */
        ret = config_writer_close_element(writer);
        if (ret) {
@@ -840,12 +914,12 @@ int save_kernel_channel(struct config_writer *writer,
                goto end;
        }
 
-       ret = save_kernel_events(writer, &kchan->events_list);
+       ret = save_kernel_events(writer, kchan);
        if (ret) {
                goto end;
        }
 
-       ret = save_kernel_context(writer, kchan->ctx);
+       ret = save_kernel_contexts(writer, kchan);
        if (ret) {
                goto end;
        }
@@ -990,7 +1064,7 @@ end:
 
 static
 int save_ust_session(struct config_writer *writer,
-       struct ltt_session *session, int save_jul)
+       struct ltt_session *session, int save_agent)
 {
        int ret;
        struct ltt_ust_channel *ust_chan;
@@ -1002,7 +1076,7 @@ int save_ust_session(struct config_writer *writer,
        assert(session);
 
        ret = config_writer_write_element_string(writer, config_element_type,
-                       save_jul ? config_domain_type_jul : config_domain_type_ust);
+                       save_agent ? config_domain_type_jul : config_domain_type_ust);
        if (ret) {
                ret = LTTNG_ERR_SAVE_IO_FAIL;
                goto end;
@@ -1032,11 +1106,12 @@ int save_ust_session(struct config_writer *writer,
        rcu_read_lock();
        cds_lfht_for_each_entry(session->ust_session->domain_global.channels->ht,
                        &iter.iter, node, node) {
-               int jul_channel;
+               int agent_channel;
 
                ust_chan = caa_container_of(node, struct ltt_ust_channel, node);
-               jul_channel = !strcmp(DEFAULT_JUL_CHANNEL_NAME, ust_chan->name);
-               if (!(save_jul ^ jul_channel)) {
+               agent_channel = !strcmp(DEFAULT_JUL_CHANNEL_NAME, ust_chan->name) ||
+                       !strcmp(DEFAULT_LOG4J_CHANNEL_NAME, ust_chan->name);
+               if (!(save_agent ^ agent_channel)) {
                        ret = save_ust_channel(writer, ust_chan, session->ust_session);
                        if (ret) {
                                rcu_read_unlock();
@@ -1118,7 +1193,7 @@ int save_domains(struct config_writer *writer, struct ltt_session *session)
        }
 
        if (session->ust_session &&
-               session->ust_session->domain_jul.being_used) {
+                       lttng_ht_get_count(session->ust_session->agents) > 0) {
                ret = config_writer_open_element(writer,
                        config_element_domain);
                if (ret) {
@@ -1493,7 +1568,7 @@ int save_session(struct ltt_session *session,
        }
        file_opened = 1;
 
-       writer = config_writer_create(fd);
+       writer = config_writer_create(fd, 1);
        if (!writer) {
                ret = LTTNG_ERR_NOMEM;
                goto end;
@@ -1524,7 +1599,7 @@ int save_session(struct ltt_session *session,
        }
 
        ret = config_writer_write_element_bool(writer, config_element_started,
-                       session->enabled);
+                       session->active);
        if (ret) {
                ret = LTTNG_ERR_SAVE_IO_FAIL;
                goto end;
@@ -1545,7 +1620,7 @@ int save_session(struct ltt_session *session,
                                goto end;
                        }
                } else {
-                       ret = config_writer_write_element_signed_int(writer,
+                       ret = config_writer_write_element_unsigned_int(writer,
                                        config_element_live_timer_interval, session->live_timer);
                        if (ret) {
                                ret = LTTNG_ERR_SAVE_IO_FAIL;