switch (dom) {
case LTTNG_DOMAIN_KERNEL:
- chan->attr.subbuf_size = DEFAULT_KERNEL_CHANNEL_SUBBUF_SIZE;
+ chan->attr.subbuf_size =
+ default_get_kernel_channel_subbuf_size();
chan->attr.num_subbuf = DEFAULT_KERNEL_CHANNEL_SUBBUF_NUM;
chan->attr.output = DEFAULT_KERNEL_CHANNEL_OUTPUT;
break;
case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
case LTTNG_DOMAIN_UST_EXEC_NAME:
#endif
- chan->attr.subbuf_size = DEFAULT_UST_CHANNEL_SUBBUF_SIZE;
+ 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;
break;
switch (domain) {
case LTTNG_DOMAIN_UST:
DBG2("Channel %s being enabled in UST global domain", uchan->name);
- /* Enable channel for global domain */
- ret = ust_app_enable_channel_glb(usess, uchan);
+
+ /*
+ * 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:
goto error;
}
- if (ret < 0) {
- if (ret != -LTTNG_UST_ERR_EXIST) {
- ret = LTTNG_ERR_UST_CHAN_ENABLE_FAIL;
- goto error;
- } else {
- ret = LTTNG_OK;
- }
- }
-
uchan->enabled = 1;
DBG2("Channel %s enabled successfully", uchan->name);
attr = defattr;
}
+ if (attr->attr.subbuf_size < DEFAULT_UST_CHANNEL_SUBBUF_SIZE) {
+ ret = LTTNG_ERR_INVALID;
+ goto error;
+ }
+
/*
* Validate UST buffer size and number of buffers: must both be
* power of 2 and nonzero. We validate right here for UST,