X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Fmain.c;h=44b0c84ba0bedf98f301c237fbf57e1994660a79;hp=8a808236878edbefdd468967386e57d6dc2d13f3;hb=7d29a2477524f7ee2ee46a94e538e6141f5ecc0e;hpb=6c9cc2aba449a320460b9a9665c66f3b32eaeca7 diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c index 8a8082368..44b0c84ba 100644 --- a/ltt-sessiond/main.c +++ b/ltt-sessiond/main.c @@ -49,7 +49,6 @@ #include "session.h" #include "traceable-app.h" #include "lttng-kconsumerd.h" -#include "libustctl.h" #include "utils.h" /* @@ -350,6 +349,7 @@ error: return ret; } +#ifdef DISABLED /* * ust_connect_app * @@ -380,6 +380,7 @@ static int ust_connect_app(pid_t pid) return sock; } +#endif /* DISABLED */ /* * notify_apps @@ -1189,7 +1190,6 @@ error: static int create_kernel_session(struct ltt_session *session) { int ret; - struct lttng_channel *chan; DBG("Creating kernel session"); @@ -1199,12 +1199,6 @@ static int create_kernel_session(struct ltt_session *session) goto error; } - chan = init_default_channel(); - if (chan == NULL) { - ret = LTTCOMM_FATAL; - goto error; - } - ret = mkdir_recursive(session->path, S_IRWXU | S_IRWXG ); if (ret < 0) { if (ret != EEXIST) { @@ -1213,16 +1207,6 @@ static int create_kernel_session(struct ltt_session *session) } } - DBG("Creating default kernel channel %s", DEFAULT_CHANNEL_NAME); - - ret = kernel_create_channel(session->kernel_session, chan, session->path); - if (ret < 0) { - ret = LTTCOMM_KERN_CHAN_FAIL; - goto error; - } - - ret = notify_kernel_pollfd(); - error: return ret; } @@ -1297,7 +1281,6 @@ static int process_client_msg(struct command_ctx *cmd_ctx) */ switch (cmd_ctx->lsm->cmd_type) { case LTTNG_KERNEL_ADD_CONTEXT: - case LTTNG_KERNEL_CREATE_CHANNEL: case LTTNG_KERNEL_DISABLE_ALL_EVENT: case LTTNG_KERNEL_DISABLE_CHANNEL: case LTTNG_KERNEL_DISABLE_EVENT: @@ -1334,6 +1317,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx) } } +#ifdef DISABLED /* Connect to ust apps if available pid */ if (cmd_ctx->lsm->pid > 0) { /* Connect to app using ustctl API */ @@ -1343,6 +1327,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx) goto error; } } +#endif /* DISABLED */ /* Process by command type */ switch (cmd_ctx->lsm->cmd_type) { @@ -1351,6 +1336,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx) int found = 0, no_event = 0; struct ltt_kernel_channel *chan; struct ltt_kernel_event *event; + struct lttng_kernel_context ctx; /* Setup lttng message with no payload */ ret = setup_lttng_msg(cmd_ctx, 0); @@ -1363,22 +1349,28 @@ static int process_client_msg(struct command_ctx *cmd_ctx) no_event = 1; } + /* Create Kernel context */ + ctx.ctx = cmd_ctx->lsm->u.context.ctx.ctx; + ctx.u.perf_counter.type = cmd_ctx->lsm->u.context.ctx.u.perf_counter.type; + ctx.u.perf_counter.config = cmd_ctx->lsm->u.context.ctx.u.perf_counter.config; + strncpy(ctx.u.perf_counter.name, + cmd_ctx->lsm->u.context.ctx.u.perf_counter.name, + sizeof(ctx.u.perf_counter.name)); + if (strlen(cmd_ctx->lsm->u.context.channel_name) == 0) { /* Go over all channels */ DBG("Adding context to all channels"); cds_list_for_each_entry(chan, &cmd_ctx->session->kernel_session->channel_list.head, list) { if (no_event) { - ret = kernel_add_channel_context(chan, - &cmd_ctx->lsm->u.context.ctx); + ret = kernel_add_channel_context(chan, &ctx); if (ret < 0) { continue; } } else { event = get_kernel_event_by_name(cmd_ctx->lsm->u.context.event_name, chan); if (event != NULL) { - ret = kernel_add_event_context(event, - &cmd_ctx->lsm->u.context.ctx); + ret = kernel_add_event_context(event, &ctx); if (ret < 0) { ret = LTTCOMM_KERN_CONTEXT_FAIL; goto error; @@ -1397,8 +1389,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx) } if (no_event) { - ret = kernel_add_channel_context(chan, - &cmd_ctx->lsm->u.context.ctx); + ret = kernel_add_channel_context(chan, &ctx); if (ret < 0) { ret = LTTCOMM_KERN_CONTEXT_FAIL; goto error; @@ -1406,8 +1397,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx) } else { event = get_kernel_event_by_name(cmd_ctx->lsm->u.context.event_name, chan); if (event != NULL) { - ret = kernel_add_event_context(event, - &cmd_ctx->lsm->u.context.ctx); + ret = kernel_add_event_context(event, &ctx); if (ret < 0) { ret = LTTCOMM_KERN_CONTEXT_FAIL; goto error; @@ -1424,33 +1414,6 @@ static int process_client_msg(struct command_ctx *cmd_ctx) ret = LTTCOMM_OK; break; } - case LTTNG_KERNEL_CREATE_CHANNEL: - { - /* Setup lttng message with no payload */ - ret = setup_lttng_msg(cmd_ctx, 0); - if (ret < 0) { - goto setup_error; - } - - /* Kernel tracer */ - DBG("Creating kernel channel"); - - ret = kernel_create_channel(cmd_ctx->session->kernel_session, - &cmd_ctx->lsm->u.channel.chan, cmd_ctx->session->path); - if (ret < 0) { - ret = LTTCOMM_KERN_CHAN_FAIL; - goto error; - } - - ret = notify_kernel_pollfd(); - if (ret < 0) { - ret = LTTCOMM_FATAL; - goto error; - } - - ret = LTTCOMM_OK; - break; - } case LTTNG_KERNEL_DISABLE_CHANNEL: { struct ltt_kernel_channel *chan; @@ -1561,8 +1524,22 @@ static int process_client_msg(struct command_ctx *cmd_ctx) chan = get_kernel_channel_by_name(cmd_ctx->lsm->u.enable.channel_name, cmd_ctx->session->kernel_session); if (chan == NULL) { - ret = LTTCOMM_KERN_CHAN_NOT_FOUND; - goto error; + /* Channel not found, creating it */ + DBG("Creating kernel channel"); + + ret = kernel_create_channel(cmd_ctx->session->kernel_session, + &cmd_ctx->lsm->u.channel.chan, cmd_ctx->session->path); + if (ret < 0) { + ret = LTTCOMM_KERN_CHAN_FAIL; + goto error; + } + + /* Notify kernel thread that there is a new channel */ + ret = notify_kernel_pollfd(); + if (ret < 0) { + ret = LTTCOMM_FATAL; + goto error; + } } else if (chan->enabled == 0) { ret = kernel_enable_channel(chan); if (ret < 0) { @@ -1579,8 +1556,10 @@ static int process_client_msg(struct command_ctx *cmd_ctx) } case LTTNG_KERNEL_ENABLE_EVENT: { - struct ltt_kernel_channel *chan; + char *channel_name; + struct ltt_kernel_channel *kchan; struct ltt_kernel_event *ev; + struct lttng_channel *chan; /* Setup lttng message with no payload */ ret = setup_lttng_msg(cmd_ctx, 0); @@ -1588,22 +1567,42 @@ static int process_client_msg(struct command_ctx *cmd_ctx) goto setup_error; } - chan = get_kernel_channel_by_name(cmd_ctx->lsm->u.enable.channel_name, - cmd_ctx->session->kernel_session); - if (chan == NULL) { - ret = LTTCOMM_KERN_CHAN_NOT_FOUND; - goto error; - } + channel_name = cmd_ctx->lsm->u.enable.channel_name; - ev = get_kernel_event_by_name(cmd_ctx->lsm->u.enable.event.name, chan); + do { + kchan = get_kernel_channel_by_name(channel_name, + cmd_ctx->session->kernel_session); + if (kchan == NULL) { + DBG("Creating default channel"); + + chan = init_default_channel(); + if (chan == NULL) { + ret = LTTCOMM_FATAL; + goto error; + } + + ret = kernel_create_channel(cmd_ctx->session->kernel_session, + chan, cmd_ctx->session->path); + if (ret < 0) { + ret = LTTCOMM_KERN_CHAN_FAIL; + goto error; + } + } + } while (kchan == NULL); + + ev = get_kernel_event_by_name(cmd_ctx->lsm->u.enable.event.name, kchan); if (ev == NULL) { DBG("Creating kernel event %s for channel %s.", - cmd_ctx->lsm->u.enable.event.name, chan->channel->name); - ret = kernel_create_event(&cmd_ctx->lsm->u.enable.event, chan); + cmd_ctx->lsm->u.enable.event.name, channel_name); + ret = kernel_create_event(&cmd_ctx->lsm->u.enable.event, kchan); } else { DBG("Enabling kernel event %s for channel %s.", - cmd_ctx->lsm->u.enable.event.name, chan->channel->name); + cmd_ctx->lsm->u.enable.event.name, channel_name); ret = kernel_enable_event(ev); + if (ret == -EEXIST) { + ret = LTTCOMM_KERN_EVENT_EXIST; + goto error; + } } if (ret < 0) { @@ -1618,10 +1617,11 @@ static int process_client_msg(struct command_ctx *cmd_ctx) case LTTNG_KERNEL_ENABLE_ALL_EVENT: { int pos, size; - char *event_list, *event, *ptr; - struct ltt_kernel_channel *chan; + char *event_list, *event, *ptr, *channel_name; + struct ltt_kernel_channel *kchan; struct ltt_kernel_event *ev; struct lttng_event ev_attr; + struct lttng_channel *chan; /* Setup lttng message with no payload */ ret = setup_lttng_msg(cmd_ctx, 0); @@ -1631,17 +1631,33 @@ static int process_client_msg(struct command_ctx *cmd_ctx) DBG("Enabling all kernel event"); - chan = get_kernel_channel_by_name(cmd_ctx->lsm->u.enable.channel_name, - cmd_ctx->session->kernel_session); - if (chan == NULL) { - ret = LTTCOMM_KERN_CHAN_NOT_FOUND; - goto error; - } + channel_name = cmd_ctx->lsm->u.enable.channel_name; + + do { + kchan = get_kernel_channel_by_name(channel_name, + cmd_ctx->session->kernel_session); + if (kchan == NULL) { + DBG("Creating default channel"); + + chan = init_default_channel(); + if (chan == NULL) { + ret = LTTCOMM_FATAL; + goto error; + } + + ret = kernel_create_channel(cmd_ctx->session->kernel_session, + &cmd_ctx->lsm->u.channel.chan, cmd_ctx->session->path); + if (ret < 0) { + ret = LTTCOMM_KERN_CHAN_FAIL; + goto error; + } + } + } while (kchan == NULL); /* For each event in the kernel session */ - cds_list_for_each_entry(ev, &chan->events_list.head, list) { + cds_list_for_each_entry(ev, &kchan->events_list.head, list) { DBG("Enabling kernel event %s for channel %s.", - ev->event->name, chan->channel->name); + ev->event->name, channel_name); ret = kernel_enable_event(ev); if (ret < 0) { continue; @@ -1656,13 +1672,13 @@ static int process_client_msg(struct command_ctx *cmd_ctx) ptr = event_list; while ((size = sscanf(ptr, "event { name = %m[^;]; };%n\n", &event, &pos)) == 1) { - ev = get_kernel_event_by_name(event, chan); + ev = get_kernel_event_by_name(event, kchan); if (ev == NULL) { strncpy(ev_attr.name, event, LTTNG_SYM_NAME_LEN); /* Default event type for enable all */ - ev_attr.type = LTTNG_EVENT_TRACEPOINTS; + ev_attr.type = LTTNG_EVENT_TRACEPOINT; /* Enable each single tracepoint event */ - ret = kernel_create_event(&ev_attr, chan); + ret = kernel_create_event(&ev_attr, kchan); if (ret < 0) { /* Ignore error here and continue */ }