Remove path and session from session message

[lttng-tools.git] / ltt-sessiond / main.c

diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c
index 49842520dd70db2a5e034f2b21d4ab652e707e54..cf88db97159c3c661d9b06201e0df6953fa003dc 100644 (file)
--- a/ltt-sessiond/main.c
+++ b/ltt-sessiond/main.c
@@ -1273,11 +1273,11 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
        case LTTNG_LIST_TRACEPOINTS:
                break;
        default:
-               DBG("Getting session %s by name", cmd_ctx->lsm->session_name);
-               cmd_ctx->session = find_session_by_name(cmd_ctx->lsm->session_name);
+               DBG("Getting session %s by name", cmd_ctx->lsm->session.name);
+               cmd_ctx->session = find_session_by_name(cmd_ctx->lsm->session.name);
                if (cmd_ctx->session == NULL) {
                        /* If session name not found */
-                       if (cmd_ctx->lsm->session_name != NULL) {
+                       if (cmd_ctx->lsm->session.name != NULL) {
                                ret = LTTCOMM_SESS_NOT_FOUND;
                        } else {        /* If no session name specified */
                                ret = LTTCOMM_SELECT_SESS;
@@ -1296,7 +1296,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
        switch (cmd_ctx->lsm->cmd_type) {
        case LTTNG_ADD_CONTEXT:
        case LTTNG_KERNEL_DISABLE_ALL_EVENT:
-       case LTTNG_KERNEL_DISABLE_CHANNEL:
+       case LTTNG_DISABLE_CHANNEL:
        case LTTNG_KERNEL_DISABLE_EVENT:
        case LTTNG_KERNEL_ENABLE_ALL_EVENT:
        case LTTNG_KERNEL_ENABLE_CHANNEL:
@@ -1376,14 +1376,15 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
                default:
                        /* TODO: Userspace tracing */
                        ret = LTTCOMM_NOT_IMPLEMENTED;
+                       goto error;
                }
 
                ret = LTTCOMM_OK;
                break;
        }
-       case LTTNG_KERNEL_DISABLE_CHANNEL:
+       case LTTNG_DISABLE_CHANNEL:
        {
-               struct ltt_kernel_channel *chan;
+               struct ltt_kernel_channel *kchan;
 
                /* Setup lttng message with no payload */
                ret = setup_lttng_msg(cmd_ctx, 0);
@@ -1391,22 +1392,30 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
                        goto setup_error;
                }
 
-               chan = get_kernel_channel_by_name(cmd_ctx->lsm->u.disable.channel_name,
-                               cmd_ctx->session->kernel_session);
-               if (chan == NULL) {
-                       ret = LTTCOMM_KERN_CHAN_NOT_FOUND;
-                       goto error;
-               } else if (chan->enabled == 1) {
-                       ret = kernel_disable_channel(chan);
-                       if (ret < 0) {
-                               if (ret != EEXIST) {
-                                       ret = LTTCOMM_KERN_CHAN_DISABLE_FAIL;
-                               }
+               switch (cmd_ctx->lsm->domain.type) {
+               case LTTNG_DOMAIN_KERNEL:
+                       kchan = get_kernel_channel_by_name(cmd_ctx->lsm->u.disable.channel_name,
+                                       cmd_ctx->session->kernel_session);
+                       if (kchan == NULL) {
+                               ret = LTTCOMM_KERN_CHAN_NOT_FOUND;
                                goto error;
+                       } else if (kchan->enabled == 1) {
+                               ret = kernel_disable_channel(kchan);
+                               if (ret < 0) {
+                                       if (ret != EEXIST) {
+                                               ret = LTTCOMM_KERN_CHAN_DISABLE_FAIL;
+                                       }
+                                       goto error;
+                               }
                        }
+                       kernel_wait_quiescent(kernel_tracer_fd);
+                       break;
+               default:
+                       /* TODO: Userspace tracing */
+                       ret = LTTCOMM_NOT_IMPLEMENTED;
+                       goto error;
                }
 
-               kernel_wait_quiescent(kernel_tracer_fd);
                ret = LTTCOMM_OK;
                break;
        }
@@ -1816,7 +1825,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
                        goto setup_error;
                }
 
-               ret = create_session(cmd_ctx->lsm->session_name, cmd_ctx->lsm->path);
+               ret = create_session(cmd_ctx->lsm->session.name, cmd_ctx->lsm->session.path);
                if (ret < 0) {
                        if (ret == -EEXIST) {
                                ret = LTTCOMM_EXIST_SESS;
@@ -1840,7 +1849,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
                /* Clean kernel session teardown */
                teardown_kernel_session(cmd_ctx->session);
 
-               ret = destroy_session(cmd_ctx->lsm->session_name);
+               ret = destroy_session(cmd_ctx->lsm->session.name);
                if (ret < 0) {
                        ret = LTTCOMM_FATAL;
                        goto error;