return ret;
}
+static int channel_validate(struct lttng_channel *attr)
+{
+ /*
+ * The ringbuffer (both in user space and kernel) behaves badly
+ * in overwrite mode and with less than 2 subbuffers so block it
+ * right away and send back an invalid attribute error.
+ */
+ if (attr->attr.overwrite && attr->attr.num_subbuf < 2) {
+ return -1;
+ }
+ return 0;
+}
+
/*
* Create kernel channel of the kernel session and notify kernel thread.
*/
attr->attr.output = LTTNG_EVENT_MMAP;
}
+ /* Validate common channel properties. */
+ if (channel_validate(attr) < 0) {
+ ret = LTTNG_ERR_INVALID;
+ goto error;
+ }
+
/* Channel not found, creating it */
ret = kernel_create_channel(ksession, attr);
if (ret < 0) {
attr->attr.output = LTTNG_EVENT_MMAP;
}
+ /* Validate common channel properties. */
+ if (channel_validate(attr) < 0) {
+ 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
}
/* Create UST channel */
- uchan = trace_ust_create_channel(attr);
+ uchan = trace_ust_create_channel(attr, LTTNG_DOMAIN_UST);
if (uchan == NULL) {
ret = LTTNG_ERR_FATAL;
goto error;
}
+
+ /*
+ * HACK: Set the channel's subdomain (JUL, Log4j, Python, etc.)
+ * based on the default name.
+ */
+ if (!strcmp(uchan->name, DEFAULT_JUL_CHANNEL_NAME)) {
+ uchan->domain = LTTNG_DOMAIN_JUL;
+ } else if (!strcmp(uchan->name, DEFAULT_LOG4J_CHANNEL_NAME)) {
+ uchan->domain = LTTNG_DOMAIN_LOG4J;
+ } else if (!strcmp(uchan->name, DEFAULT_PYTHON_CHANNEL_NAME)) {
+ uchan->domain = LTTNG_DOMAIN_PYTHON;
+ }
+
uchan->enabled = 1;
if (trace_ust_is_max_id(usess->used_channel_id)) {
ret = LTTNG_ERR_UST_CHAN_FAIL;