int ret;
struct ltt_kernel_channel *kchan;
+ assert(ksession);
+ assert(channel_name);
+
kchan = trace_kernel_get_channel_by_name(channel_name, ksession);
if (kchan == NULL) {
ret = LTTNG_ERR_KERN_CHAN_NOT_FOUND;
goto error;
- } else if (kchan->enabled == 1) {
+ }
+
+ /* Only if channel is enabled disable it. */
+ if (kchan->enabled == 1) {
ret = kernel_disable_channel(kchan);
if (ret < 0 && ret != -EEXIST) {
ret = LTTNG_ERR_KERN_CHAN_DISABLE_FAIL;
{
int ret;
+ assert(ksession);
+ assert(kchan);
+
if (kchan->enabled == 0) {
ret = kernel_enable_channel(kchan);
if (ret < 0) {
int ret;
struct lttng_channel *defattr = NULL;
+ assert(ksession);
+
/* Creating channel attributes if needed */
if (attr == NULL) {
defattr = channel_new_default_attr(LTTNG_DOMAIN_KERNEL);
}
/* 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;
{
int ret = LTTNG_OK;
+ assert(usess);
+ assert(uchan);
+
/* If already enabled, everything is OK */
if (uchan->enabled) {
DBG3("Channel %s already enabled. Skipping", uchan->name);
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);
struct ltt_ust_channel *uchan = NULL;
struct lttng_channel *defattr = NULL;
+ assert(usess);
+
/* Creating channel attributes if needed */
if (attr == NULL) {
defattr = channel_new_default_attr(domain);
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,
- * because applications will not report the error to the user
- * (unlike kernel tracing).
+ * Validate UST buffer size and number of buffers: must both be power of 2
+ * and nonzero. We validate right here for UST, because applications will
+ * not report the error to the user (unlike kernel tracing).
*/
- if (!attr->attr.subbuf_size || (attr->attr.subbuf_size & (attr->attr.subbuf_size - 1))) {
+ if (!attr->attr.subbuf_size ||
+ (attr->attr.subbuf_size & (attr->attr.subbuf_size - 1))) {
ret = LTTNG_ERR_INVALID;
goto error;
}
- if (!attr->attr.num_subbuf || (attr->attr.num_subbuf & (attr->attr.num_subbuf - 1))) {
+
+ if (!attr->attr.num_subbuf ||
+ (attr->attr.num_subbuf & (attr->attr.num_subbuf - 1))) {
ret = LTTNG_ERR_INVALID;
goto error;
}
{
int ret = LTTNG_OK;
+ assert(usess);
+ assert(uchan);
+
/* Already disabled */
if (uchan->enabled == 0) {
DBG2("Channel UST %s already disabled", uchan->name);