/*
* 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 <lttng/ust-error.h>
#include <urcu/compiler.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"
static int lttng_ust_abi_close_in_progress;
static
int lttng_abi_tracepoint_list(void);
+static
+int lttng_abi_tracepoint_field_list(void);
/*
* Object descriptor table. Should be protected from concurrent access
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_loglevel_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;
+static const struct lttng_ust_objd_ops lttng_tracepoint_field_list_ops;
enum channel_type {
PER_CPU_CHANNEL,
long lttng_abi_tracer_version(int objd,
struct lttng_ust_tracer_version *v)
{
- v->major = LTTNG_UST_MAJOR_VERSION;
- v->minor = LTTNG_UST_MINOR_VERSION;
- v->patchlevel = LTTNG_UST_PATCHLEVEL_VERSION;
+ v->major = LTTNG_UST_INTERNAL_MAJOR_VERSION;
+ v->minor = LTTNG_UST_INTERNAL_MINOR_VERSION;
+ v->patchlevel = LTTNG_UST_INTERNAL_PATCHLEVEL_VERSION;
return 0;
}
* Returns the LTTng kernel tracer version
* LTTNG_UST_TRACEPOINT_LIST
* Returns a file descriptor listing available tracepoints
+ * LTTNG_UST_TRACEPOINT_FIELD_LIST
+ * Returns a file descriptor listing available tracepoint fields
* LTTNG_UST_WAIT_QUIESCENT
* Returns after all previously running probes have completed
*
(struct lttng_ust_tracer_version *) arg);
case LTTNG_UST_TRACEPOINT_LIST:
return lttng_abi_tracepoint_list();
+ case LTTNG_UST_TRACEPOINT_FIELD_LIST:
+ return lttng_abi_tracepoint_field_list();
case LTTNG_UST_WAIT_QUIESCENT:
synchronize_trace();
return 0;
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.
*/
- ret = ltt_event_create(channel, &metadata_params, NULL, &event);
+ ret = ltt_event_create(channel, &metadata_params, &event);
if (ret < 0) {
goto create_error;
}
retry:
iter = lttng_ust_tracepoint_list_get_iter_next(list);
if (!iter)
- return -ENOENT;
+ return -LTTNG_UST_ERR_NOENT;
if (!strcmp(iter->name, "lttng_ust:metadata"))
goto retry;
memcpy(tp, iter, sizeof(*tp));
.cmd = lttng_tracepoint_list_cmd,
};
+static
+long lttng_tracepoint_field_list_cmd(int objd, unsigned int cmd,
+ unsigned long arg, union ust_args *uargs)
+{
+ struct lttng_ust_field_list *list = objd_private(objd);
+ struct lttng_ust_field_iter *tp = &uargs->field_list.entry;
+ struct lttng_ust_field_iter *iter;
+
+ switch (cmd) {
+ case LTTNG_UST_TRACEPOINT_FIELD_LIST_GET:
+ {
+ retry:
+ iter = lttng_ust_field_list_get_iter_next(list);
+ if (!iter)
+ return -LTTNG_UST_ERR_NOENT;
+ if (!strcmp(iter->event_name, "lttng_ust:metadata"))
+ goto retry;
+ memcpy(tp, iter, sizeof(*tp));
+ return 0;
+ }
+ default:
+ return -EINVAL;
+ }
+}
+
+static
+int lttng_abi_tracepoint_field_list(void)
+{
+ int list_objd, ret;
+ struct lttng_ust_field_list *list;
+
+ list_objd = objd_alloc(NULL, <tng_tracepoint_field_list_ops);
+ if (list_objd < 0) {
+ ret = list_objd;
+ goto objd_error;
+ }
+ list = zmalloc(sizeof(*list));
+ if (!list) {
+ ret = -ENOMEM;
+ goto alloc_error;
+ }
+ objd_set_private(list_objd, list);
+
+ /* populate list by walking on all registered probes. */
+ ret = ltt_probes_get_field_list(list);
+ if (ret) {
+ goto list_error;
+ }
+ return list_objd;
+
+list_error:
+ free(list);
+alloc_error:
+ {
+ int err;
+
+ err = lttng_ust_objd_unref(list_objd);
+ assert(!err);
+ }
+objd_error:
+ return ret;
+}
+
+static
+int lttng_release_tracepoint_field_list(int objd)
+{
+ struct lttng_ust_field_list *list = objd_private(objd);
+
+ if (list) {
+ ltt_probes_prune_field_list(list);
+ free(list);
+ return 0;
+ } else {
+ return -EINVAL;
+ }
+}
+
+static const struct lttng_ust_objd_ops lttng_tracepoint_field_list_ops = {
+ .release = lttng_release_tracepoint_field_list,
+ .cmd = lttng_tracepoint_field_list_cmd,
+};
+
struct stream_priv_data {
struct lttng_ust_lib_ring_buffer *buf;
struct ltt_channel *ltt_chan;
* We tolerate no failure path after event creation. It will stay
* invariant for the rest of the session.
*/
- ret = ltt_event_create(channel, event_param, NULL, &event);
+ ret = ltt_event_create(channel, event_param, &event);
if (ret < 0) {
goto event_error;
}
* Enable recording for this event (weak enable)
* LTTNG_UST_DISABLE
* Disable recording for this event (strong disable)
+ * LTTNG_UST_FILTER
+ * Attach a filter to an event.
*/
static
long lttng_event_cmd(int objd, unsigned int cmd, unsigned long arg,
return ltt_event_enable(event);
case LTTNG_UST_DISABLE:
return ltt_event_disable(event);
+ case LTTNG_UST_FILTER:
+ {
+ int ret;
+ ret = lttng_filter_event_attach_bytecode(event,
+ (struct lttng_ust_filter_bytecode *) arg);
+ if (ret)
+ return ret;
+ lttng_filter_event_link_bytecode(event,
+ event->filter_bytecode);
+ return 0;
+ }
default:
return -EINVAL;
}
.cmd = lttng_event_cmd,
};
-/**
- * lttng_loglevel_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
- * loglevel.
- * LTTNG_UST_ENABLE
- * Enable recording for these loglevel events (weak enable)
- * LTTNG_UST_DISABLE
- * Disable recording for these loglevel events (strong disable)
- */
-static
-long lttng_loglevel_cmd(int objd, unsigned int cmd, unsigned long arg,
- union ust_args *uargs)
-{
- struct session_loglevel *loglevel = 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,
- &loglevel->ctx, loglevel->chan->session);
-#endif
- case LTTNG_UST_ENABLE:
- return ltt_loglevel_enable(loglevel);
- case LTTNG_UST_DISABLE:
- return ltt_loglevel_disable(loglevel);
- default:
- return -EINVAL;
- }
-}
-
-static
-int lttng_loglevel_release(int objd)
-{
- struct session_loglevel *loglevel = objd_private(objd);
-
- if (loglevel)
- return lttng_ust_objd_unref(loglevel->chan->objd);
- return 0;
-}
-
-/* TODO: filter control ioctl */
-static const struct lttng_ust_objd_ops lttng_loglevel_ops = {
- .release = lttng_loglevel_release,
- .cmd = lttng_loglevel_cmd,
-};
-
/**
* lttng_wildcard_cmd - lttng control through object descriptors
*
* Enable recording for these wildcard events (weak enable)
* LTTNG_UST_DISABLE
* Disable recording for these wildcard events (strong disable)
+ * LTTNG_UST_FILTER
+ * Attach a filter to a wildcard.
*/
static
long lttng_wildcard_cmd(int objd, unsigned int cmd, unsigned long arg,
return ltt_wildcard_enable(wildcard);
case LTTNG_UST_DISABLE:
return ltt_wildcard_disable(wildcard);
+ case LTTNG_UST_FILTER:
+ {
+ int ret;
+
+ ret = lttng_filter_wildcard_attach_bytecode(wildcard,
+ (struct lttng_ust_filter_bytecode *) arg);
+ if (ret)
+ return ret;
+ lttng_filter_wildcard_link_bytecode(wildcard);
+ return 0;
+ }
default:
return -EINVAL;
}
projects / lttng-ust.git / blobdiff