#include <urcu/compiler.h>
#include <urcu/list.h>
#include <lttng/ust-events.h>
-#include <lttng/usterr-signal-safe.h>
-#include "lttng/core.h"
+#include <lttng/ust-version.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 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 lib_ring_buffer_objd_ops;
static const struct lttng_ust_objd_ops lttng_tracepoint_list_ops;
long lttng_abi_tracer_version(int objd,
struct lttng_ust_tracer_version *v)
{
- v->version = LTTNG_UST_VERSION;
- v->patchlevel = LTTNG_UST_PATCHLEVEL;
- v->sublevel = LTTNG_UST_SUBLEVEL;
+ v->major = LTTNG_UST_MAJOR_VERSION;
+ v->minor = LTTNG_UST_MINOR_VERSION;
+ v->patchlevel = LTTNG_UST_PATCHLEVEL_VERSION;
return 0;
}
struct ltt_channel *channel = objd_private(channel_objd);
static struct lttng_ust_event metadata_params = {
.instrumentation = LTTNG_UST_TRACEPOINT,
- .name = "lttng:metadata",
+ .name = "lttng_ust:metadata",
};
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;
.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: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)
{
- 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 {
* 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_loglevel(int channel_objd,
+ struct lttng_ust_event *event_param)
+{
+ struct ltt_channel *channel = objd_private(channel_objd);
+ struct session_loglevel *loglevel;
+ int loglevel_objd, ret;
+
+ event_param->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
+ loglevel_objd = objd_alloc(NULL, <tng_loglevel_ops);
+ if (loglevel_objd < 0) {
+ ret = loglevel_objd;
+ goto objd_error;
+ }
+ /*
+ * We tolerate no failure path after loglevel creation. It will
+ * stay invariant for the rest of the session.
+ */
+ ret = ltt_loglevel_create(channel, event_param, &loglevel);
+ if (ret < 0) {
+ goto loglevel_error;
+ }
+ objd_set_private(loglevel_objd, loglevel);
+ /* The loglevel holds a reference on the channel */
+ objd_ref(channel_objd);
+ return loglevel_objd;
+
+loglevel_error:
+ {
+ int err;
+
+ err = lttng_ust_objd_unref(loglevel_objd);
+ assert(!err);
+ }
+objd_error:
+ return ret;
+}
+
/**
* lttng_channel_cmd - lttng control through object descriptors
*
return lttng_abi_open_stream(objd, stream);
}
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->instrumentation == LTTNG_UST_TRACEPOINT_LOGLEVEL) {
+ return lttng_abi_create_loglevel(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,
buf = priv->buf;
channel = priv->ltt_chan;
free(priv);
- channel->ops->buffer_read_close(buf, channel->handle);
+ /*
+ * If we are at ABI exit, we don't want to close the
+ * buffer opened for read: it is being shared between
+ * the parent and child (right after fork), and we don't
+ * want the child to close it for the parent. For a real
+ * exit, we don't care about marking it as closed, as
+ * the consumer daemon (if there is one) will do fine
+ * even if we don't mark it as "closed" for reading on
+ * our side.
+ * We only mark it as closed if it is being explicitely
+ * released by the session daemon with an explicit
+ * release command.
+ */
+ if (!lttng_ust_abi_close_in_progress)
+ channel->ops->buffer_read_close(buf, channel->handle);
return lttng_ust_objd_unref(channel->objd);
}
.cmd = lttng_event_cmd,
};
+/**
+ * lttng_loglevel_cmd - lttng control through object descriptors
+ *
+ * @objd: the object descriptor
+ * @cmd: the command
+ * @arg: command arg
+ *
+ * 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)
+{
+ 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,
+};
+
void lttng_ust_abi_exit(void)
{
+ lttng_ust_abi_close_in_progress = 1;
objd_table_destroy();
+ lttng_ust_abi_close_in_progress = 0;
}
projects / lttng-ust.git / blobdiff