Fix: Missing semicolon after debug statement

[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 d268f33190698d6f9bd920a5bbdbab140a377d70..6f095ec27b8e76e2572c06adf4b2b10e4803337d 100644 (file)
--- a/src/bin/lttng-sessiond/save.c
+++ b/src/bin/lttng-sessiond/save.c
@@ -624,11 +624,14 @@ int save_ust_event(struct config_writer *writer,
                goto end;
        }
 
-       ret = config_writer_write_element_signed_int(writer,
-               config_element_loglevel, event->attr.loglevel);
-       if (ret) {
-               ret = LTTNG_ERR_SAVE_IO_FAIL;
-               goto end;
+       /* The log level is irrelevant if no "filtering" is enabled */
+       if (event->attr.loglevel_type != LTTNG_UST_LOGLEVEL_ALL) {
+               ret = config_writer_write_element_signed_int(writer,
+                               config_element_loglevel, event->attr.loglevel);
+               if (ret) {
+                       ret = LTTNG_ERR_SAVE_IO_FAIL;
+                       goto end;
+               }
        }
 
        if (event->filter_expression) {
@@ -801,6 +804,11 @@ int save_kernel_contexts(struct config_writer *writer,
        int ret;
        struct ltt_kernel_context *ctx;
 
+       if (cds_list_empty(&kchan->ctx_list)) {
+               ret = 0;
+               goto end;
+       }
+
        ret = config_writer_open_element(writer, config_element_contexts);
        if (ret) {
                ret = LTTNG_ERR_SAVE_IO_FAIL;
@@ -895,7 +903,7 @@ int save_ust_context(struct config_writer *writer,
                        context_type_string = get_ust_context_type_string(
                                ctx->ctx.ctx);
                        if (!context_type_string) {
-                               ERR("Unsupported UST context type.")
+                               ERR("Unsupported UST context type.");
                                        ret = LTTNG_ERR_INVALID;
                                goto end;
                        }
@@ -1218,6 +1226,8 @@ int save_domains(struct config_writer *writer, struct ltt_session *session)
        }
 
        if (session->ust_session) {
+               unsigned long agent_count;
+
                ret = config_writer_open_element(writer,
                        config_element_domain);
                if (ret) {
@@ -1236,30 +1246,37 @@ int save_domains(struct config_writer *writer, struct ltt_session *session)
                        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);
-               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();
 
-               ret = save_ust_session(writer, session, 1);
-               if (ret) {
-                       goto end;
-               }
+               if (agent_count > 0) {
+                       ret = config_writer_open_element(writer,
+                               config_element_domain);
+                       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;
+                       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;
+                       }
                }
        }
 
+       if (session->ust_session) {
+       }
+
        /* /domains */
        ret = config_writer_close_element(writer);
        if (ret) {