nobase_include_HEADERS = \
lttng/marker.h \
lttng/tracepoint.h \
+ lttng/tracepoint-types.h \
lttng/tracepoint-event.h \
lttng/ust-tracepoint-event.h \
lttng/ust-tracepoint-event-reset.h \
-#ifndef _UST_TRACEPOINT_INTERNAL_H
-#define _UST_TRACEPOINT_INTERNAL_H
+#ifndef _LTTNG_TRACEPOINT_INTERNAL_H
+#define _LTTNG_TRACEPOINT_INTERNAL_H
/*
* tracepoint-internal.h
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Heavily inspired from the Linux Kernel Markers.
- *
- * Ported to userspace by Pierre-Marc Fournier.
*/
#include <urcu-bp.h>
#include <lttng/core.h>
#include <urcu/list.h>
-#include <lttng/tracepoint.h>
+#include <lttng/tracepoint-types.h>
struct tracepoint_lib {
struct tracepoint * const *tracepoints_start;
extern void init_tracepoint(void);
extern void exit_tracepoint(void);
-#endif /* _UST_TRACEPOINT_INTERNAL_H */
+#endif /* _LTTNG_TRACEPOINT_INTERNAL_H */
--- /dev/null
+#ifndef _LTTNG_TRACEPOINT_TYPES_H
+#define _LTTNG_TRACEPOINT_TYPES_H
+
+/*
+ * Copyright (C) 2008-2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2009 Pierre-Marc Fournier
+ * Copyright (C) 2009 Steven Rostedt <rostedt@goodmis.org>
+ *
+ * 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;
+ * 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
+ *
+ * Heavily inspired from the Linux Kernel Markers.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct tracepoint_probe {
+ void *func;
+ void *data;
+};
+
+struct tracepoint {
+ const char *name; /* Tracepoint name */
+ char state; /* State. */
+ struct tracepoint_probe *probes;
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _LTTNG_TRACEPOINT_TYPES_H */
-#ifndef _UST_TRACEPOINT_H
-#define _UST_TRACEPOINT_H
+#ifndef _LTTNG_TRACEPOINT_H
+#define _LTTNG_TRACEPOINT_H
/*
* Copyright (C) 2008-2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Heavily inspired from the Linux Kernel Markers.
- *
- * Ported to userspace by Pierre-Marc Fournier.
*/
#include <urcu-bp.h>
#include <urcu/list.h>
+#include <lttng/tracepoint-types.h>
#ifdef __cplusplus
extern "C" {
#endif
-struct tracepoint_probe {
- void *func;
- void *data;
-};
-
-struct tracepoint {
- const char *name; /* Tracepoint name */
- char state; /* State. */
- struct tracepoint_probe *probes;
-};
-
/*
* Tracepoints should be added to the instrumented code using the
* "tracepoint()" macro.
}
#endif
-#endif /* _UST_TRACEPOINT_H */
+#endif /* _LTTNG_TRACEPOINT_H */
#define LTTNG_UST_ENABLE _UST_CMD(0x80)
#define LTTNG_UST_DISABLE _UST_CMD(0x81)
+/* Tracepoint list commands */
+#define LTTNG_UST_TRACEPOINT_LIST_GET _UST_CMD(0x90)
+
#define LTTNG_UST_ROOT_HANDLE 0
struct lttng_ust_obj;
struct lttng_ust_event event;
struct lttng_ust_context context;
struct lttng_ust_tracer_version version;
+ char tracepoint_list_entry[LTTNG_UST_SYM_NAME_LEN];
} u;
};
-#ifndef _UST_LTTNG_EVENTS_H
-#define _UST_LTTNG_EVENTS_H
+#ifndef _LTTNG_UST_EVENTS_H
+#define _LTTNG_UST_EVENTS_H
/*
- * ust/lttng-events.h
+ * lttng/ust-events.h
*
* Copyright 2010 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*
#include <lttng/ust-tracer.h>
#include <endian.h>
#include <float.h>
+#include <lttng/tracepoint-internal.h>
struct ltt_channel;
struct ltt_session;
struct ltt_channel_ops ops;
};
+struct ltt_tracepoint_list {
+ struct tracepoint_iter iter;
+ int got_first;
+};
+
struct ltt_session *ltt_session_create(void);
int ltt_session_enable(struct ltt_session *session);
int ltt_session_disable(struct ltt_session *session);
struct cds_list_head ltt_transport_list;
struct ltt_transport *ltt_transport_find(const char *name);
-#endif /* _UST_LTTNG_EVENTS_H */
+#endif /* _LTTNG_UST_EVENTS_H */
#include "lttng/core.h"
#include "ltt-tracer.h"
+static
+int lttng_abi_tracepoint_list(void);
+
/*
* Object descriptor table. Should be protected from concurrent access
* by the caller.
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 lib_ring_buffer_objd_ops;
+static const struct lttng_ust_objd_ops lttng_tracepoint_list_ops;
enum channel_type {
PER_CPU_CHANNEL,
return ret;
}
-#if 0
-static
-int lttng_abi_tracepoint_list(void)
-{
- int list_objd, ret;
-
- /* TODO: Create list private data */
- list_objd = objd_alloc(NULL, <tng_tracepoint_list_ops);
- if (list_objd < 0) {
- ret = list_objd;
- goto objd_error;
- }
-
- return list_objd;
-
-objd_error:
- return ret;
-}
-#endif //0
-
static
long lttng_abi_tracer_version(int objd,
struct lttng_ust_tracer_version *v)
return lttng_abi_tracer_version(objd,
(struct lttng_ust_tracer_version *) arg);
case LTTNG_UST_TRACEPOINT_LIST:
- return -ENOSYS; //TODO
- //return lttng_abi_tracepoint_list();
+ return lttng_abi_tracepoint_list();
case LTTNG_UST_WAIT_QUIESCENT:
synchronize_trace();
return 0;
.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)
+{
+ 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 {
+ 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);
+
+ switch (cmd) {
+ case LTTNG_UST_TRACEPOINT_LIST_GET:
+ ltt_tracepoint_list_get(list, (char *) arg);
+ return 0;
+ default:
+ return -EINVAL;
+ }
+}
+
+static
+int lttng_abi_tracepoint_list(void)
+{
+ int list_objd, ret;
+ struct ltt_tracepoint_list *list;
+
+ list_objd = objd_alloc(NULL, <tng_tracepoint_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);
+
+ return list_objd;
+
+alloc_error:
+ {
+ int err;
+
+ err = lttng_ust_objd_unref(list_objd);
+ assert(!err);
+ }
+objd_error:
+ return ret;
+}
+
+static
+int lttng_release_tracepoint_list(int objd)
+{
+ struct ltt_tracepoint_list *list = objd_private(objd);
+
+ if (list) {
+ tracepoint_iter_stop(&list->iter);
+ free(list);
+ return 0;
+ } else {
+ return -EINVAL;
+ }
+}
+
+static const struct lttng_ust_objd_ops lttng_tracepoint_list_ops = {
+ .release = lttng_release_tracepoint_list,
+ .cmd = lttng_tracepoint_list_cmd,
+};
+
struct stream_priv_data {
struct lttng_ust_lib_ring_buffer *buf;
struct ltt_channel *ltt_chan;
projects / lttng-ust.git / commitdiff
