X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fchannel.c;h=1621bc626bba7d72b52098b8c1798ee859d80c70;hb=ee69440bd276dbc8a5c78b0138c8e6944d571b4a;hp=e11d6d11fbcffa74d813d0722dcc7a4e65bc10aa;hpb=0525e9ae15d215943d8187e7f190d5a45e723085;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/channel.c b/src/bin/lttng-sessiond/channel.c index e11d6d11f..1621bc626 100644 --- a/src/bin/lttng-sessiond/channel.c +++ b/src/bin/lttng-sessiond/channel.c @@ -16,6 +16,7 @@ */ #define _GNU_SOURCE +#include #include #include @@ -49,8 +50,6 @@ struct lttng_channel *channel_new_default_attr(int dom) } chan->attr.overwrite = DEFAULT_CHANNEL_OVERWRITE; - chan->attr.switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER; - chan->attr.read_timer_interval = DEFAULT_CHANNEL_READ_TIMER; switch (dom) { case LTTNG_DOMAIN_KERNEL: @@ -58,6 +57,8 @@ struct lttng_channel *channel_new_default_attr(int dom) default_get_kernel_channel_subbuf_size(); chan->attr.num_subbuf = DEFAULT_KERNEL_CHANNEL_SUBBUF_NUM; chan->attr.output = DEFAULT_KERNEL_CHANNEL_OUTPUT; + chan->attr.switch_timer_interval = DEFAULT_KERNEL_CHANNEL_SWITCH_TIMER; + chan->attr.read_timer_interval = DEFAULT_KERNEL_CHANNEL_READ_TIMER; break; case LTTNG_DOMAIN_UST: #if 0 @@ -68,6 +69,8 @@ struct lttng_channel *channel_new_default_attr(int dom) chan->attr.subbuf_size = default_get_ust_channel_subbuf_size(); chan->attr.num_subbuf = DEFAULT_UST_CHANNEL_SUBBUF_NUM; chan->attr.output = DEFAULT_UST_CHANNEL_OUTPUT; + chan->attr.switch_timer_interval = DEFAULT_UST_CHANNEL_SWITCH_TIMER; + chan->attr.read_timer_interval = DEFAULT_UST_CHANNEL_READ_TIMER; break; default: goto error; /* Not implemented */ @@ -164,7 +167,7 @@ int channel_kernel_create(struct ltt_kernel_session *ksession, } /* Channel not found, creating it */ - ret = kernel_create_channel(ksession, attr, ksession->trace_path); + ret = kernel_create_channel(ksession, attr); if (ret < 0) { ret = LTTNG_ERR_KERN_CHAN_FAIL; goto error; @@ -186,7 +189,7 @@ error: /* * Enable UST channel for session and domain. */ -int channel_ust_enable(struct ltt_ust_session *usess, int domain, +int channel_ust_enable(struct ltt_ust_session *usess, struct ltt_ust_channel *uchan) { int ret = LTTNG_OK; @@ -201,43 +204,30 @@ int channel_ust_enable(struct ltt_ust_session *usess, int domain, goto end; } - switch (domain) { - case LTTNG_DOMAIN_UST: - DBG2("Channel %s being enabled in UST global domain", uchan->name); - - /* - * Enable channel for UST global domain on all applications. Ignore - * return value here since whatever error we got, it means that the - * channel was not created on one or many registered applications and - * we can not report this to the user yet. However, at this stage, the - * channel was successfully created on the session daemon side so the - * enable-channel command is a success. - */ - (void) ust_app_create_channel_glb(usess, uchan); - break; -#if 0 - case LTTNG_DOMAIN_UST_PID: - case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN: - case LTTNG_DOMAIN_UST_EXEC_NAME: -#endif - default: - ret = LTTNG_ERR_UND; - goto error; - } + DBG2("Channel %s being enabled in UST domain", uchan->name); + + /* + * Enable channel for UST global domain on all applications. Ignore return + * value here since whatever error we got, it means that the channel was + * not created on one or many registered applications and we can not report + * this to the user yet. However, at this stage, the channel was + * successfully created on the session daemon side so the enable-channel + * command is a success. + */ + (void) ust_app_create_channel_glb(usess, uchan); uchan->enabled = 1; DBG2("Channel %s enabled successfully", uchan->name); end: -error: return ret; } /* * Create UST channel for session and domain. */ -int channel_ust_create(struct ltt_ust_session *usess, int domain, - struct lttng_channel *attr) +int channel_ust_create(struct ltt_ust_session *usess, + struct lttng_channel *attr, enum lttng_buffer_type type) { int ret = LTTNG_OK; struct ltt_ust_channel *uchan = NULL; @@ -247,7 +237,7 @@ int channel_ust_create(struct ltt_ust_session *usess, int domain, /* Creating channel attributes if needed */ if (attr == NULL) { - defattr = channel_new_default_attr(domain); + defattr = channel_new_default_attr(LTTNG_DOMAIN_UST); if (defattr == NULL) { ret = LTTNG_ERR_FATAL; goto error; @@ -282,6 +272,16 @@ int channel_ust_create(struct ltt_ust_session *usess, int domain, goto error; } + /* + * The tracefile_size should not be < to the subbuf_size, otherwise + * we won't be able to write the packets on disk + */ + if ((attr->attr.tracefile_size > 0) && + (attr->attr.tracefile_size < attr->attr.subbuf_size)) { + ret = LTTNG_ERR_INVALID; + goto error; + } + /* Create UST channel */ uchan = trace_ust_create_channel(attr, usess->pathname); if (uchan == NULL) { @@ -289,24 +289,27 @@ int channel_ust_create(struct ltt_ust_session *usess, int domain, goto error; } uchan->enabled = 1; - - switch (domain) { - case LTTNG_DOMAIN_UST: - DBG2("Channel %s being created in UST global domain", uchan->name); - - /* Enable channel for global domain */ - ret = ust_app_create_channel_glb(usess, uchan); - break; -#if 0 - case LTTNG_DOMAIN_UST_PID: - case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN: - case LTTNG_DOMAIN_UST_EXEC_NAME: -#endif - default: - ret = LTTNG_ERR_UND; + if (trace_ust_is_max_id(usess->used_channel_id)) { + ret = LTTNG_ERR_UST_CHAN_FAIL; + goto error; + } + uchan->id = trace_ust_get_next_chan_id(usess); + + DBG2("Channel %s is being created for UST with buffer %d and id %" PRIu64, + uchan->name, type, uchan->id); + + /* Flag session buffer type. */ + if (!usess->buffer_type_changed) { + usess->buffer_type = type; + usess->buffer_type_changed = 1; + } else if (usess->buffer_type != type) { + /* Buffer type was already set. Refuse to create channel. */ + ret = LTTNG_ERR_BUFFER_TYPE_MISMATCH; goto error_free_chan; } + /* Enable channel for global domain */ + ret = ust_app_create_channel_glb(usess, uchan); if (ret < 0 && ret != -LTTNG_UST_ERR_EXIST) { ret = LTTNG_ERR_UST_CHAN_FAIL; goto error_free_chan; @@ -336,7 +339,7 @@ error: /* * Disable UST channel for session and domain. */ -int channel_ust_disable(struct ltt_ust_session *usess, int domain, +int channel_ust_disable(struct ltt_ust_session *usess, struct ltt_ust_channel *uchan) { int ret = LTTNG_OK; @@ -350,23 +353,9 @@ int channel_ust_disable(struct ltt_ust_session *usess, int domain, goto end; } - /* Get the right channel's hashtable */ - switch (domain) { - case LTTNG_DOMAIN_UST: - DBG2("Channel %s being disabled in UST global domain", uchan->name); - /* Disable channel for global domain */ - ret = ust_app_disable_channel_glb(usess, uchan); - break; -#if 0 - case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN: - case LTTNG_DOMAIN_UST_EXEC_NAME: - case LTTNG_DOMAIN_UST_PID: -#endif - default: - ret = LTTNG_ERR_UND; - goto error; - } - + DBG2("Channel %s being disabled in UST global domain", uchan->name); + /* Disable channel for global domain */ + ret = ust_app_disable_channel_glb(usess, uchan); if (ret < 0 && ret != -LTTNG_UST_ERR_EXIST) { ret = LTTNG_ERR_UST_CHAN_DISABLE_FAIL; goto error;