/*
- * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
* Copyright (C) 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
*
* SPDX-License-Identifier: GPL-2.0-only
#include <string.h>
#include <unistd.h>
-#include <common/common.h>
-#include <common/defaults.h>
-#include <common/sessiond-comm/sessiond-comm.h>
+#include <common/common.hpp>
+#include <common/defaults.hpp>
+#include <common/sessiond-comm/sessiond-comm.hpp>
-#include "channel.h"
-#include "lttng-sessiond.h"
-#include "kernel.h"
-#include "lttng-ust-ctl.h"
-#include "lttng-ust-error.h"
-#include "utils.h"
-#include "ust-app.h"
-#include "agent.h"
+#include "channel.hpp"
+#include "lttng-sessiond.hpp"
+#include "kernel.hpp"
+#include "lttng-ust-ctl.hpp"
+#include "lttng-ust-error.hpp"
+#include "utils.hpp"
+#include "ust-app.hpp"
+#include "agent.hpp"
/*
* Return allocated channel attributes.
/*
* Enable kernel channel of the kernel session.
*/
-int channel_kernel_enable(struct ltt_kernel_session *ksession,
+enum lttng_error_code channel_kernel_enable(struct ltt_kernel_session *ksession,
struct ltt_kernel_channel *kchan)
{
- int ret;
+ enum lttng_error_code ret_code;
LTTNG_ASSERT(ksession);
LTTNG_ASSERT(kchan);
if (kchan->enabled == 0) {
- ret = kernel_enable_channel(kchan);
- if (ret < 0) {
- ret = LTTNG_ERR_KERN_CHAN_ENABLE_FAIL;
+ if (kernel_enable_channel(kchan) < 0) {
+ ret_code = LTTNG_ERR_KERN_CHAN_ENABLE_FAIL;
goto error;
}
} else {
- ret = LTTNG_ERR_KERN_CHAN_EXIST;
+ ret_code = LTTNG_ERR_KERN_CHAN_EXIST;
goto error;
}
- ret = LTTNG_OK;
+ ret_code = LTTNG_OK;
error:
- return ret;
+ return ret_code;
}
static int channel_validate(struct lttng_channel *attr)
/*
* Create kernel channel of the kernel session and notify kernel thread.
*/
-int channel_kernel_create(struct ltt_kernel_session *ksession,
+enum lttng_error_code channel_kernel_create(struct ltt_kernel_session *ksession,
struct lttng_channel *attr, int kernel_pipe)
{
- int ret;
+ enum lttng_error_code ret_code;
struct lttng_channel *defattr = NULL;
LTTNG_ASSERT(ksession);
defattr = channel_new_default_attr(LTTNG_DOMAIN_KERNEL,
LTTNG_BUFFER_GLOBAL);
if (defattr == NULL) {
- ret = LTTNG_ERR_FATAL;
+ ret_code = LTTNG_ERR_FATAL;
goto error;
}
attr = defattr;
/* Validate common channel properties. */
if (channel_validate(attr) < 0) {
- ret = LTTNG_ERR_INVALID;
+ ret_code = LTTNG_ERR_INVALID;
goto error;
}
if (channel_validate_kernel(attr) < 0) {
- ret = LTTNG_ERR_INVALID;
+ ret_code = LTTNG_ERR_INVALID;
goto error;
}
- /* Channel not found, creating it */
- ret = kernel_create_channel(ksession, attr);
- if (ret < 0) {
- ret = LTTNG_ERR_KERN_CHAN_FAIL;
+ /* Channel not found, creating it. */
+ if (kernel_create_channel(ksession, attr) < 0) {
+ ret_code = LTTNG_ERR_KERN_CHAN_FAIL;
goto error;
}
/* Notify kernel thread that there is a new channel */
- ret = notify_thread_pipe(kernel_pipe);
- if (ret < 0) {
- ret = LTTNG_ERR_FATAL;
+ if (notify_thread_pipe(kernel_pipe) < 0) {
+ ret_code = LTTNG_ERR_FATAL;
goto error;
}
- ret = LTTNG_OK;
+ ret_code = LTTNG_OK;
error:
channel_attr_destroy(defattr);
- return ret;
+ return ret_code;
}
/*
* Enable UST channel for session and domain.
*/
-int channel_ust_enable(struct ltt_ust_session *usess,
+enum lttng_error_code channel_ust_enable(struct ltt_ust_session *usess,
struct ltt_ust_channel *uchan)
{
- int ret = LTTNG_OK;
+ enum lttng_error_code ret_code = LTTNG_OK;
LTTNG_ASSERT(usess);
LTTNG_ASSERT(uchan);
/* If already enabled, everything is OK */
if (uchan->enabled) {
DBG3("Channel %s already enabled. Skipping", uchan->name);
- ret = LTTNG_ERR_UST_CHAN_EXIST;
+ ret_code = LTTNG_ERR_UST_CHAN_EXIST;
goto end;
} else {
uchan->enabled = 1;
end:
- return ret;
+ return ret_code;
}
/*
* Create UST channel for session and domain.
*/
-int channel_ust_create(struct ltt_ust_session *usess,
+enum lttng_error_code channel_ust_create(struct ltt_ust_session *usess,
struct lttng_channel *attr, enum lttng_buffer_type type)
{
- int ret = LTTNG_OK;
+ enum lttng_error_code ret_code = LTTNG_OK;
struct ltt_ust_channel *uchan = NULL;
struct lttng_channel *defattr = NULL;
enum lttng_domain_type domain = LTTNG_DOMAIN_UST;
if (attr == NULL) {
defattr = channel_new_default_attr(LTTNG_DOMAIN_UST, type);
if (defattr == NULL) {
- ret = LTTNG_ERR_FATAL;
+ ret_code = LTTNG_ERR_FATAL;
goto error;
}
attr = defattr;
/* Validate common channel properties. */
if (channel_validate(attr) < 0) {
- ret = LTTNG_ERR_INVALID;
+ ret_code = LTTNG_ERR_INVALID;
goto error;
}
*/
if (!attr->attr.subbuf_size ||
(attr->attr.subbuf_size & (attr->attr.subbuf_size - 1))) {
- ret = LTTNG_ERR_INVALID;
+ ret_code = LTTNG_ERR_INVALID;
goto error;
}
* Invalid subbuffer size if it's lower then the page size.
*/
if (attr->attr.subbuf_size < the_page_size) {
- ret = LTTNG_ERR_INVALID;
+ ret_code = LTTNG_ERR_INVALID;
goto error;
}
if (!attr->attr.num_subbuf ||
(attr->attr.num_subbuf & (attr->attr.num_subbuf - 1))) {
- ret = LTTNG_ERR_INVALID;
+ ret_code = LTTNG_ERR_INVALID;
goto error;
}
if (attr->attr.output != LTTNG_EVENT_MMAP) {
- ret = LTTNG_ERR_NOT_SUPPORTED;
+ ret_code = LTTNG_ERR_NOT_SUPPORTED;
goto error;
}
*/
if ((attr->attr.tracefile_size > 0) &&
(attr->attr.tracefile_size < attr->attr.subbuf_size)) {
- ret = LTTNG_ERR_INVALID;
+ ret_code = LTTNG_ERR_INVALID;
goto error;
}
case LTTNG_BUFFER_PER_UID:
break;
default:
- ret = LTTNG_ERR_BUFFER_NOT_SUPPORTED;
+ ret_code = LTTNG_ERR_BUFFER_NOT_SUPPORTED;
goto error;
}
/* Create UST channel */
uchan = trace_ust_create_channel(attr, domain);
if (uchan == NULL) {
- ret = LTTNG_ERR_FATAL;
+ ret_code = LTTNG_ERR_FATAL;
goto error;
}
uchan->enabled = 1;
if (trace_ust_is_max_id(usess->used_channel_id)) {
- ret = LTTNG_ERR_UST_CHAN_FAIL;
+ ret_code = LTTNG_ERR_UST_CHAN_FAIL;
goto error;
}
uchan->id = trace_ust_get_next_chan_id(usess);
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;
+ ret_code = LTTNG_ERR_BUFFER_TYPE_MISMATCH;
goto error_free_chan;
}
if (!agt) {
agt = agent_create(domain);
if (!agt) {
- ret = LTTNG_ERR_NOMEM;
+ ret_code = LTTNG_ERR_NOMEM;
goto error_remove_chan;
}
agent_add(agt, usess->agents);
trace_ust_destroy_channel(uchan);
error:
channel_attr_destroy(defattr);
- return ret;
+ return ret_code;
}
/*
error:
return ret;
}
+
+struct lttng_channel *trace_ust_channel_to_lttng_channel(
+ const struct ltt_ust_channel *uchan)
+{
+ struct lttng_channel *channel = NULL, *ret = NULL;
+
+ channel = lttng_channel_create_internal();
+ if (!channel) {
+ ERR("Failed to create lttng_channel during conversion from ltt_ust_channel to lttng_channel");
+ goto end;
+ }
+
+ if (lttng_strncpy(channel->name, uchan->name, LTTNG_SYMBOL_NAME_LEN)) {
+ ERR("Failed to set channel name during conversion from ltt_ust_channel to lttng_channel");
+ goto end;
+ }
+
+ channel->attr.overwrite = uchan->attr.overwrite;
+ channel->attr.subbuf_size = uchan->attr.subbuf_size;
+ channel->attr.num_subbuf = uchan->attr.num_subbuf;
+ channel->attr.switch_timer_interval = uchan->attr.switch_timer_interval;
+ channel->attr.read_timer_interval = uchan->attr.read_timer_interval;
+ channel->enabled = uchan->enabled;
+ channel->attr.tracefile_size = uchan->tracefile_size;
+ channel->attr.tracefile_count = uchan->tracefile_count;
+
+ /*
+ * Map enum lttng_ust_output to enum lttng_event_output.
+ */
+ switch (uchan->attr.output) {
+ case LTTNG_UST_ABI_MMAP:
+ channel->attr.output = LTTNG_EVENT_MMAP;
+ break;
+ default:
+ /*
+ * LTTNG_UST_MMAP is the only supported UST
+ * output mode.
+ */
+ abort();
+ break;
+ }
+
+ lttng_channel_set_blocking_timeout(
+ channel, uchan->attr.u.s.blocking_timeout);
+ lttng_channel_set_monitor_timer_interval(
+ channel, uchan->monitor_timer_interval);
+
+ ret = channel;
+ channel = NULL;
+
+end:
+ lttng_channel_destroy(channel);
+ return ret;
+}
projects / lttng-tools.git / blobdiff