#include <urcu/compiler.h>
#include <urcu/list.h>
-#include <ust-helper.h>
#include <lttng/tracepoint.h>
#include <lttng/ust-abi.h>
#include <lttng/ust-error.h>
#include "string-utils.h"
#include "ust-events-internal.h"
#include "context-internal.h"
+#include "ust-helper.h"
#define OBJ_NAME_LEN 16
static
int lttng_is_channel_ready(struct lttng_channel *lttng_chan)
{
- struct channel *chan;
+ struct lttng_ust_lib_ring_buffer_channel *chan;
unsigned int nr_streams, exp_streams;
chan = lttng_chan->chan;
static
int lttng_abi_create_session(void *owner)
{
- struct lttng_session *session;
+ struct lttng_ust_session *session;
int session_objd, ret;
session = lttng_session_create();
long lttng_abi_add_context(int objd,
struct lttng_ust_abi_context *context_param,
union lttng_ust_abi_args *uargs,
- struct lttng_ctx **ctx, struct lttng_session *session)
+ struct lttng_ust_ctx **ctx, struct lttng_ust_session *session)
{
return lttng_attach_context(context_param, uargs, ctx, session);
}
union lttng_ust_abi_args *uargs,
void *owner)
{
- struct lttng_session *session = objd_private(session_objd);
+ struct lttng_ust_session *session = objd_private(session_objd);
const char *transport_name;
- const struct lttng_transport *transport;
+ struct lttng_transport *transport;
const char *chan_name;
int chan_objd;
struct lttng_ust_shm_handle *channel_handle;
+ struct lttng_ust_abi_channel_config *lttng_chan_config;
struct lttng_channel *lttng_chan;
- struct channel *chan;
+ struct lttng_ust_lib_ring_buffer_channel *chan;
struct lttng_ust_lib_ring_buffer_config *config;
void *chan_data;
int wakeup_fd;
goto active; /* Refuse to add channel to active session */
}
+ lttng_chan = zmalloc(sizeof(struct lttng_channel));
+ if (!lttng_chan) {
+ ret = -ENOMEM;
+ goto lttng_chan_error;
+ }
+
channel_handle = channel_handle_create(chan_data, len, wakeup_fd);
if (!channel_handle) {
ret = -EINVAL;
assert(chan);
chan->handle = channel_handle;
config = &chan->backend.config;
- lttng_chan = channel_get_private(chan);
- if (!lttng_chan) {
+ lttng_chan_config = channel_get_private_config(chan);
+ if (!lttng_chan_config) {
ret = -EINVAL;
goto alloc_error;
}
ret = -EINVAL;
goto notransport;
}
- transport = lttng_transport_find(transport_name);
+ transport = lttng_ust_transport_find(transport_name);
if (!transport) {
DBG("LTTng transport %s not found\n",
transport_name);
lttng_chan->header_type = 0;
lttng_chan->handle = channel_handle;
lttng_chan->type = type;
+ /* Copy fields from lttng ust chan config. */
+ lttng_chan->id = lttng_chan_config->id;
+ memcpy(lttng_chan->uuid, lttng_chan_config->uuid, LTTNG_UST_UUID_LEN);
+ channel_set_private(chan, lttng_chan);
/*
* We tolerate no failure path after channel creation. It will stay
notransport:
alloc_error:
channel_destroy(chan, channel_handle, 0);
+ free(lttng_chan);
return ret;
handle_error:
+ free(lttng_chan);
+lttng_chan_error:
active:
invalid:
return ret;
long lttng_session_cmd(int objd, unsigned int cmd, unsigned long arg,
union lttng_ust_abi_args *uargs, void *owner)
{
- struct lttng_session *session = objd_private(objd);
+ struct lttng_ust_session *session = objd_private(objd);
switch (cmd) {
case LTTNG_UST_ABI_CHANNEL:
static
int lttng_release_session(int objd)
{
- struct lttng_session *session = objd_private(objd);
+ struct lttng_ust_session *session = objd_private(objd);
if (session) {
lttng_session_destroy(session);
return ret;
}
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
int lttng_release_event_notifier_group_error_counter(int objd)
{
struct lttng_counter *counter = objd_private(objd);
case LTTNG_UST_ABI_DISABLE:
return lttng_channel_disable(channel);
case LTTNG_UST_ABI_FLUSH_BUFFER:
- return channel->ops->flush_buffer(channel->chan, channel->handle);
+ return channel->ops->priv->flush_buffer(channel->chan, channel->handle);
default:
return -EINVAL;
}