SoW-2020-0002: Trace Hit Counters: trigger error reporting integration

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

diff --git a/src/bin/lttng-sessiond/client.c b/src/bin/lttng-sessiond/client.c
index 8a2ef85b7345c33d89cd2914134bd075a71b4e9e..b1c8cee9f8d1ecd5377e6a04814bcccbd63802e5 100644 (file)
--- a/src/bin/lttng-sessiond/client.c
+++ b/src/bin/lttng-sessiond/client.c
@@ -42,6 +42,7 @@
 #include "utils.h"
 #include "manage-consumer.h"
 #include "clear.h"
 #include "utils.h"
 #include "manage-consumer.h"
 #include "clear.h"

+#include "agent-thread.h"

 
 static bool is_root;
 
 
 static bool is_root;
 


@@ -770,6 +771,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
        int ret = LTTNG_OK;
        int need_tracing_session = 1;
        int need_domain;
        int ret = LTTNG_OK;
        int need_tracing_session = 1;
        int need_domain;

+       int need_consumerd = 1;

 
        DBG("Processing client command %d", cmd_ctx->lsm.cmd_type);
 
 
        DBG("Processing client command %d", cmd_ctx->lsm.cmd_type);
 


@@ -793,19 +795,29 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
        case LTTNG_SET_SESSION_SHM_PATH:
        case LTTNG_REGENERATE_METADATA:
        case LTTNG_REGENERATE_STATEDUMP:
        case LTTNG_SET_SESSION_SHM_PATH:
        case LTTNG_REGENERATE_METADATA:
        case LTTNG_REGENERATE_STATEDUMP:

-       case LTTNG_REGISTER_TRIGGER:
-       case LTTNG_UNREGISTER_TRIGGER:

        case LTTNG_ROTATE_SESSION:
        case LTTNG_ROTATION_GET_INFO:
        case LTTNG_ROTATION_SET_SCHEDULE:
        case LTTNG_SESSION_LIST_ROTATION_SCHEDULES:
        case LTTNG_CLEAR_SESSION:
        case LTTNG_ROTATE_SESSION:
        case LTTNG_ROTATION_GET_INFO:
        case LTTNG_ROTATION_SET_SCHEDULE:
        case LTTNG_SESSION_LIST_ROTATION_SCHEDULES:
        case LTTNG_CLEAR_SESSION:

+       case LTTNG_LIST_TRIGGERS:

                need_domain = 0;
                break;
        default:
                need_domain = 1;
        }
 
                need_domain = 0;
                break;
        default:
                need_domain = 1;
        }
 

+       /* Needs a functioning consumerd */
+       switch (cmd_ctx->lsm.cmd_type) {
+       case LTTNG_REGISTER_TRIGGER:
+       case LTTNG_UNREGISTER_TRIGGER:
+               need_consumerd = 0;
+               break;
+       default:
+               need_consumerd = 1;
+               break;
+       }
+

        if (config.no_kernel && need_domain
                        && cmd_ctx->lsm.domain.type == LTTNG_DOMAIN_KERNEL) {
                if (!is_root) {
        if (config.no_kernel && need_domain
                        && cmd_ctx->lsm.domain.type == LTTNG_DOMAIN_KERNEL) {
                if (!is_root) {


@@ -846,6 +858,8 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
        case LTTNG_DATA_PENDING:
        case LTTNG_ROTATE_SESSION:
        case LTTNG_ROTATION_GET_INFO:
        case LTTNG_DATA_PENDING:
        case LTTNG_ROTATE_SESSION:
        case LTTNG_ROTATION_GET_INFO:

+       case LTTNG_REGISTER_TRIGGER:
+       case LTTNG_LIST_TRIGGERS:

                break;
        default:
                /* Setup lttng message with no payload */
                break;
        default:
                /* Setup lttng message with no payload */


@@ -866,6 +880,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
        case LTTNG_SAVE_SESSION:
        case LTTNG_REGISTER_TRIGGER:
        case LTTNG_UNREGISTER_TRIGGER:
        case LTTNG_SAVE_SESSION:
        case LTTNG_REGISTER_TRIGGER:
        case LTTNG_UNREGISTER_TRIGGER:

+       case LTTNG_LIST_TRIGGERS:

                need_tracing_session = 0;
                break;
        default:
                need_tracing_session = 0;
                break;
        default:


@@ -944,7 +959,8 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
                }
 
                /* Consumer is in an ERROR state. Report back to client */
                }
 
                /* Consumer is in an ERROR state. Report back to client */

-               if (uatomic_read(&kernel_consumerd_state) == CONSUMER_ERROR) {
+               if (need_consumerd && uatomic_read(&kernel_consumerd_state) ==
+                                                     CONSUMER_ERROR) {

                        ret = LTTNG_ERR_NO_KERNCONSUMERD;
                        goto error;
                }
                        ret = LTTNG_ERR_NO_KERNCONSUMERD;
                        goto error;
                }


@@ -989,14 +1005,21 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
        case LTTNG_DOMAIN_JUL:
        case LTTNG_DOMAIN_LOG4J:
        case LTTNG_DOMAIN_PYTHON:
        case LTTNG_DOMAIN_JUL:
        case LTTNG_DOMAIN_LOG4J:
        case LTTNG_DOMAIN_PYTHON:

+               if (!agent_tracing_is_enabled()) {
+                       ret = LTTNG_ERR_AGENT_TRACING_DISABLED;
+                       goto error;
+               }
+               /* Fallthrough */

        case LTTNG_DOMAIN_UST:
        {
                if (!ust_app_supported()) {
                        ret = LTTNG_ERR_NO_UST;
                        goto error;
                }
        case LTTNG_DOMAIN_UST:
        {
                if (!ust_app_supported()) {
                        ret = LTTNG_ERR_NO_UST;
                        goto error;
                }

+

                /* Consumer is in an ERROR state. Report back to client */
                /* Consumer is in an ERROR state. Report back to client */

-               if (uatomic_read(&ust_consumerd_state) == CONSUMER_ERROR) {
+               if (need_consumerd && uatomic_read(&ust_consumerd_state) ==
+                                                     CONSUMER_ERROR) {

                        ret = LTTNG_ERR_NO_USTCONSUMERD;
                        goto error;
                }
                        ret = LTTNG_ERR_NO_USTCONSUMERD;
                        goto error;
                }


@@ -1445,7 +1468,7 @@ error_add_context:
        {
                struct lttng_event *ev = NULL;
                struct lttng_event_exclusion *exclusion = NULL;
        {
                struct lttng_event *ev = NULL;
                struct lttng_event_exclusion *exclusion = NULL;

-               struct lttng_filter_bytecode *bytecode = NULL;
+               struct lttng_bytecode *bytecode = NULL;

                char *filter_expression = NULL;
 
                /* Handle exclusion events and receive it from the client. */
                char *filter_expression = NULL;
 
                /* Handle exclusion events and receive it from the client. */


@@ -2024,8 +2047,39 @@ error_add_context:
        }
        case LTTNG_REGISTER_TRIGGER:
        {
        }
        case LTTNG_REGISTER_TRIGGER:
        {

+               struct lttng_trigger *return_trigger;
+               size_t original_payload_size;
+               size_t payload_size;
+
+               ret = setup_empty_lttng_msg(cmd_ctx);
+               if (ret) {
+                       ret = LTTNG_ERR_NOMEM;
+                       goto setup_error;
+               }
+
+               original_payload_size = cmd_ctx->reply_payload.buffer.size;
+

                ret = cmd_register_trigger(cmd_ctx, *sock,
                ret = cmd_register_trigger(cmd_ctx, *sock,

-                               notification_thread_handle);
+                               notification_thread_handle, &return_trigger);
+               if (ret != LTTNG_OK) {
+                       goto error;
+               }
+
+               ret = lttng_trigger_serialize(return_trigger, &cmd_ctx->reply_payload);
+               if (ret) {
+                       ERR("Failed to serialize trigger in reply to \"register trigger\" command");
+                       ret = LTTNG_ERR_NOMEM;
+                       lttng_trigger_destroy(return_trigger);
+                       goto error;
+               }
+               lttng_trigger_destroy(return_trigger);
+
+               payload_size = cmd_ctx->reply_payload.buffer.size -
+                       original_payload_size;
+
+               update_lttng_msg(cmd_ctx, 0, payload_size);
+
+               ret = LTTNG_OK;

                break;
        }
        case LTTNG_UNREGISTER_TRIGGER:
                break;
        }
        case LTTNG_UNREGISTER_TRIGGER:


@@ -2138,6 +2192,42 @@ error_add_context:
                ret = cmd_clear_session(cmd_ctx->session, sock);
                break;
        }
                ret = cmd_clear_session(cmd_ctx->session, sock);
                break;
        }

+       case LTTNG_LIST_TRIGGERS:
+       {
+               struct lttng_triggers *return_triggers;
+               size_t original_payload_size;
+               size_t payload_size;
+
+               ret = setup_empty_lttng_msg(cmd_ctx);
+               if (ret) {
+                       ret = LTTNG_ERR_NOMEM;
+                       goto setup_error;
+               }
+
+               original_payload_size = cmd_ctx->reply_payload.buffer.size;
+
+               ret = cmd_list_triggers(cmd_ctx,
+                               notification_thread_handle, &return_triggers);
+               if (ret != LTTNG_OK) {
+                       goto error;
+               }
+
+               ret = lttng_triggers_serialize(
+                               return_triggers, &cmd_ctx->reply_payload);
+               lttng_triggers_destroy(return_triggers);
+               if (ret) {
+                       ERR("Failed to serialize triggers in reply to \"list triggers\" command");
+                       ret = LTTNG_ERR_NOMEM;
+                       goto error;
+               }
+               payload_size = cmd_ctx->reply_payload.buffer.size -
+                       original_payload_size;
+
+               update_lttng_msg(cmd_ctx, 0, payload_size);
+
+               ret = LTTNG_OK;
+               break;
+       }

        default:
                ret = LTTNG_ERR_UND;
                break;
        default:
                ret = LTTNG_ERR_UND;
                break;