/*
* lttng-ust-abi.c
*
- * Copyright 2010-2011 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
* LTTng UST ABI
*
+ * Copyright (C) 2010-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; only
+ * version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ *
* Mimic system calls for:
* - session creation, returns an object descriptor or failure.
* - channel creation, returns an object descriptor or failure.
* - Takes an instrumentation source as parameter
* - e.g. tracepoints, dynamic_probes...
* - Takes instrumentation source specific arguments.
- *
- * Dual LGPL v2.1/GPL v2 license.
*/
#include <lttng/ust-abi.h>
#include <urcu/list.h>
#include <lttng/ust-events.h>
#include <lttng/ust-version.h>
+#include <lttng/tracepoint.h>
+#include "tracepoint-internal.h"
#include <usterr-signal-safe.h>
#include <helper.h>
#include "ltt-tracer.h"
-#include "tracepoint-internal.h"
-
-struct ltt_tracepoint_list {
- struct tracepoint_iter iter;
- int got_first;
-};
static int lttng_ust_abi_close_in_progress;
static const struct lttng_ust_objd_ops lttng_channel_ops;
static const struct lttng_ust_objd_ops lttng_metadata_ops;
static const struct lttng_ust_objd_ops lttng_event_ops;
+static const struct lttng_ust_objd_ops lttng_wildcard_ops;
static const struct lttng_ust_objd_ops lib_ring_buffer_objd_ops;
static const struct lttng_ust_objd_ops lttng_tracepoint_list_ops;
* @objd: the object descriptor
* @cmd: the command
* @arg: command arg
+ * @uargs: UST arguments (internal)
*
* This descriptor implements lttng commands:
* LTTNG_UST_SESSION
* The returned session will be deleted when its file descriptor is closed.
*/
static
-long lttng_cmd(int objd, unsigned int cmd, unsigned long arg)
+long lttng_cmd(int objd, unsigned int cmd, unsigned long arg,
+ union ust_args *uargs)
{
switch (cmd) {
case LTTNG_UST_SESSION:
static struct lttng_ust_event metadata_params = {
.instrumentation = LTTNG_UST_TRACEPOINT,
.name = "lttng_ust:metadata",
+ .loglevel_type = LTTNG_UST_LOGLEVEL_ALL,
+ .loglevel = TRACE_DEFAULT,
};
struct ltt_event *event;
+ int ret;
/*
* We tolerate no failure path after event creation. It will stay
* invariant for the rest of the session.
*/
- event = ltt_event_create(channel, &metadata_params, NULL);
- if (!event) {
+ ret = ltt_event_create(channel, &metadata_params, NULL, &event);
+ if (ret < 0) {
goto create_error;
}
return;
int lttng_abi_create_channel(int session_objd,
struct lttng_ust_channel *chan_param,
- enum channel_type channel_type)
+ enum channel_type channel_type,
+ union ust_args *uargs)
{
struct ltt_session *session = objd_private(session_objd);
const struct lttng_ust_objd_ops *ops;
chan_param->num_subbuf,
chan_param->switch_timer_interval,
chan_param->read_timer_interval,
- &chan_param->shm_fd,
- &chan_param->wait_fd,
- &chan_param->memory_map_size,
+ &uargs->channel.shm_fd,
+ &uargs->channel.shm_path,
+ &uargs->channel.wait_fd,
+ &uargs->channel.wait_pipe_path,
+ &uargs->channel.memory_map_size,
&chan_priv_init);
if (!chan) {
ret = -EINVAL;
* @obj: the object
* @cmd: the command
* @arg: command arg
+ * @uargs: UST arguments (internal)
*
* This descriptor implements lttng commands:
* LTTNG_UST_CHANNEL
* The returned channel will be deleted when its file descriptor is closed.
*/
static
-long lttng_session_cmd(int objd, unsigned int cmd, unsigned long arg)
+long lttng_session_cmd(int objd, unsigned int cmd, unsigned long arg,
+ union ust_args *uargs)
{
struct ltt_session *session = objd_private(objd);
case LTTNG_UST_CHANNEL:
return lttng_abi_create_channel(objd,
(struct lttng_ust_channel *) arg,
- PER_CPU_CHANNEL);
+ PER_CPU_CHANNEL, uargs);
case LTTNG_UST_SESSION_START:
case LTTNG_UST_ENABLE:
return ltt_session_enable(session);
case LTTNG_UST_METADATA:
return lttng_abi_create_channel(objd,
(struct lttng_ust_channel *) arg,
- METADATA_CHANNEL);
+ METADATA_CHANNEL, uargs);
default:
return -EINVAL;
}
.cmd = lttng_session_cmd,
};
-/*
- * beware: we don't keep the mutex over the send, but we must walk the
- * whole list each time we are called again. So sending one tracepoint
- * at a time means this is O(n^2). TODO: do as in the kernel and send
- * multiple tracepoints for each call to amortize this cost.
- */
-static
-void ltt_tracepoint_list_get(struct ltt_tracepoint_list *list,
- char *tp_list_entry)
-{
-next:
- if (!list->got_first) {
- tracepoint_iter_start(&list->iter);
- list->got_first = 1;
- goto copy;
- }
- tracepoint_iter_next(&list->iter);
-copy:
- if (!list->iter.tracepoint) {
- tp_list_entry[0] = '\0'; /* end of list */
- } else {
- if (!strcmp((*list->iter.tracepoint)->name,
- "lttng_ust:metadata"))
- goto next;
- memcpy(tp_list_entry, (*list->iter.tracepoint)->name,
- LTTNG_UST_SYM_NAME_LEN);
- }
-}
-
static
-long lttng_tracepoint_list_cmd(int objd, unsigned int cmd, unsigned long arg)
+long lttng_tracepoint_list_cmd(int objd, unsigned int cmd, unsigned long arg,
+ union ust_args *uargs)
{
- struct ltt_tracepoint_list *list = objd_private(objd);
- char *str = (char *) arg;
+ struct lttng_ust_tracepoint_list *list = objd_private(objd);
+ struct lttng_ust_tracepoint_iter *tp =
+ (struct lttng_ust_tracepoint_iter *) arg;
+ struct lttng_ust_tracepoint_iter *iter;
switch (cmd) {
case LTTNG_UST_TRACEPOINT_LIST_GET:
- ltt_tracepoint_list_get(list, str);
- if (str[0] == '\0')
+ {
+ retry:
+ iter = lttng_ust_tracepoint_list_get_iter_next(list);
+ if (!iter)
return -ENOENT;
+ if (!strcmp(iter->name, "lttng_ust:metadata"))
+ goto retry;
+ memcpy(tp, iter, sizeof(*tp));
return 0;
+ }
default:
return -EINVAL;
}
int lttng_abi_tracepoint_list(void)
{
int list_objd, ret;
- struct ltt_tracepoint_list *list;
+ struct lttng_ust_tracepoint_list *list;
list_objd = objd_alloc(NULL, <tng_tracepoint_list_ops);
if (list_objd < 0) {
}
objd_set_private(list_objd, list);
+ /* populate list by walking on all registered probes. */
+ ret = ltt_probes_get_event_list(list);
+ if (ret) {
+ goto list_error;
+ }
return list_objd;
+list_error:
+ free(list);
alloc_error:
{
int err;
static
int lttng_release_tracepoint_list(int objd)
{
- struct ltt_tracepoint_list *list = objd_private(objd);
+ struct lttng_ust_tracepoint_list *list = objd_private(objd);
if (list) {
- tracepoint_iter_stop(&list->iter);
+ ltt_probes_prune_event_list(list);
free(list);
return 0;
} else {
};
static
-int lttng_abi_open_stream(int channel_objd, struct lttng_ust_stream *info)
+int lttng_abi_open_stream(int channel_objd, struct lttng_ust_stream *info,
+ union ust_args *uargs)
{
struct ltt_channel *channel = objd_private(channel_objd);
struct lttng_ust_lib_ring_buffer *buf;
int stream_objd, ret;
buf = channel->ops->buffer_read_open(channel->chan, channel->handle,
- &info->shm_fd, &info->wait_fd, &info->memory_map_size);
+ &uargs->stream.shm_fd, &uargs->stream.shm_path,
+ &uargs->stream.wait_fd, &uargs->stream.wait_pipe_path,
+ &uargs->stream.memory_map_size);
if (!buf)
return -ENOENT;
* We tolerate no failure path after event creation. It will stay
* invariant for the rest of the session.
*/
- event = ltt_event_create(channel, event_param, NULL);
- if (!event) {
- ret = -EINVAL;
+ ret = ltt_event_create(channel, event_param, NULL, &event);
+ if (ret < 0) {
goto event_error;
}
objd_set_private(event_objd, event);
return ret;
}
+static
+int lttng_abi_create_wildcard(int channel_objd,
+ struct lttng_ust_event *event_param)
+{
+ struct ltt_channel *channel = objd_private(channel_objd);
+ struct session_wildcard *wildcard;
+ int wildcard_objd, ret;
+
+ event_param->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
+ wildcard_objd = objd_alloc(NULL, <tng_wildcard_ops);
+ if (wildcard_objd < 0) {
+ ret = wildcard_objd;
+ goto objd_error;
+ }
+ /*
+ * We tolerate no failure path after wildcard creation. It will
+ * stay invariant for the rest of the session.
+ */
+ ret = ltt_wildcard_create(channel, event_param, &wildcard);
+ if (ret < 0) {
+ goto wildcard_error;
+ }
+ objd_set_private(wildcard_objd, wildcard);
+ /* The wildcard holds a reference on the channel */
+ objd_ref(channel_objd);
+ return wildcard_objd;
+
+wildcard_error:
+ {
+ int err;
+
+ err = lttng_ust_objd_unref(wildcard_objd);
+ assert(!err);
+ }
+objd_error:
+ return ret;
+}
+
/**
* lttng_channel_cmd - lttng control through object descriptors
*
* @objd: the object descriptor
* @cmd: the command
* @arg: command arg
+ * @uargs: UST arguments (internal)
*
* This object descriptor implements lttng commands:
* LTTNG_UST_STREAM
* Channel and event file descriptors also hold a reference on the session.
*/
static
-long lttng_channel_cmd(int objd, unsigned int cmd, unsigned long arg)
+long lttng_channel_cmd(int objd, unsigned int cmd, unsigned long arg,
+ union ust_args *uargs)
{
struct ltt_channel *channel = objd_private(objd);
stream = (struct lttng_ust_stream *) arg;
/* stream used as output */
- return lttng_abi_open_stream(objd, stream);
+ return lttng_abi_open_stream(objd, stream, uargs);
}
case LTTNG_UST_EVENT:
- return lttng_abi_create_event(objd, (struct lttng_ust_event *) arg);
+ {
+ struct lttng_ust_event *event_param =
+ (struct lttng_ust_event *) arg;
+ if (event_param->name[strlen(event_param->name) - 1] == '*') {
+ /* If ends with wildcard, create wildcard. */
+ return lttng_abi_create_wildcard(objd, event_param);
+ } else {
+ return lttng_abi_create_event(objd, event_param);
+ }
+ }
case LTTNG_UST_CONTEXT:
return lttng_abi_add_context(objd,
(struct lttng_ust_context *) arg,
* @objd: the object descriptor
* @cmd: the command
* @arg: command arg
+ * @uargs: UST arguments (internal)
*
* This object descriptor implements lttng commands:
* LTTNG_UST_STREAM
* Channel and event file descriptors also hold a reference on the session.
*/
static
-long lttng_metadata_cmd(int objd, unsigned int cmd, unsigned long arg)
+long lttng_metadata_cmd(int objd, unsigned int cmd, unsigned long arg,
+ union ust_args *uargs)
{
struct ltt_channel *channel = objd_private(objd);
stream = (struct lttng_ust_stream *) arg;
/* stream used as output */
- return lttng_abi_open_stream(objd, stream);
+ return lttng_abi_open_stream(objd, stream, uargs);
}
case LTTNG_UST_FLUSH_BUFFER:
return channel->ops->flush_buffer(channel->chan, channel->handle);
* @objd: the object descriptor
* @cmd: the command
* @arg: command arg
+ * @uargs: UST arguments (internal)
*
* This object descriptor implements lttng commands:
* (None for now. Access is done directly though shm.)
*/
static
-long lttng_rb_cmd(int objd, unsigned int cmd, unsigned long arg)
+long lttng_rb_cmd(int objd, unsigned int cmd, unsigned long arg,
+ union ust_args *uargs)
{
switch (cmd) {
default:
* @objd: the object descriptor
* @cmd: the command
* @arg: command arg
+ * @uargs: UST arguments (internal)
*
* This object descriptor implements lttng commands:
* LTTNG_UST_CONTEXT
* Disable recording for this event (strong disable)
*/
static
-long lttng_event_cmd(int objd, unsigned int cmd, unsigned long arg)
+long lttng_event_cmd(int objd, unsigned int cmd, unsigned long arg,
+ union ust_args *uargs)
{
struct ltt_event *event = objd_private(objd);
.cmd = lttng_event_cmd,
};
+/**
+ * lttng_wildcard_cmd - lttng control through object descriptors
+ *
+ * @objd: the object descriptor
+ * @cmd: the command
+ * @arg: command arg
+ * @uargs: UST arguments (internal)
+ *
+ * This object descriptor implements lttng commands:
+ * LTTNG_UST_CONTEXT
+ * Prepend a context field to each record of events of this
+ * wildcard.
+ * LTTNG_UST_ENABLE
+ * Enable recording for these wildcard events (weak enable)
+ * LTTNG_UST_DISABLE
+ * Disable recording for these wildcard events (strong disable)
+ */
+static
+long lttng_wildcard_cmd(int objd, unsigned int cmd, unsigned long arg,
+ union ust_args *uargs)
+{
+ struct session_wildcard *wildcard = objd_private(objd);
+
+ switch (cmd) {
+ case LTTNG_UST_CONTEXT:
+ return -ENOSYS; /* not implemented yet */
+#if 0
+ return lttng_abi_add_context(objd,
+ (struct lttng_ust_context *) arg,
+ &wildcard->ctx, wildcard->chan->session);
+#endif
+ case LTTNG_UST_ENABLE:
+ return ltt_wildcard_enable(wildcard);
+ case LTTNG_UST_DISABLE:
+ return ltt_wildcard_disable(wildcard);
+ default:
+ return -EINVAL;
+ }
+}
+
+static
+int lttng_wildcard_release(int objd)
+{
+ struct session_wildcard *wildcard = objd_private(objd);
+
+ if (wildcard)
+ return lttng_ust_objd_unref(wildcard->chan->objd);
+ return 0;
+}
+
+/* TODO: filter control ioctl */
+static const struct lttng_ust_objd_ops lttng_wildcard_ops = {
+ .release = lttng_wildcard_release,
+ .cmd = lttng_wildcard_cmd,
+};
+
void lttng_ust_abi_exit(void)
{
lttng_ust_abi_close_in_progress = 1;
projects / lttng-ust.git / blobdiff