X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Fust%2Fprobe.h;h=fe27da2b11e1c44aad99c10c0d8d22e89810bf13;hb=3c82ede91f6c984248977a5f81eed3f7d1badfce;hp=a4f3a0e502c579bba8b95e635cdb3fe0b3d8c472;hpb=3fa2687d72239b458cd1d3753842402cda1d1b90;p=ust.git

diff --git a/include/ust/probe.h b/include/ust/probe.h
index a4f3a0e..fe27da2 100644
--- a/include/ust/probe.h
+++ b/include/ust/probe.h
@@ -1,13 +1,12 @@
-#ifndef _UST_PROBE_H
-#define _UST_PROBE_H
-
 /*
- * Copyright (C) 2009 Pierre-Marc Fournier
+ * Copyright (C) 2009     Steven Rostedt <srostedt@redhat.com>
+ * Copyright (C) 2010     Nils Carlson <nils.carlson@ericsson.com>
+ * Copyright (C) 2011     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; either
- * version 2.1 of the License, or (at your option) any later version.
+ * 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
@@ -17,35 +16,81 @@
  * 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
- *
  */
 
-/* Maximum number of callbacks per marker */
-#define LTT_NR_CALLBACKS        10
-
-struct ltt_serialize_closure;
-struct ust_buffer;
-
-typedef size_t (*ltt_serialize_cb)(struct ust_buffer *buf, size_t buf_offset,
-                        struct ltt_serialize_closure *closure,
-                        void *serialize_private,
-			unsigned int stack_pos_ctx,
-			int *largest_align,
-                        const char *fmt, va_list *args);
-
-struct ltt_available_probe {
-        const char *name;               /* probe name */
-        const char *format;
-        ust_marker_probe_func *probe_func;
-        ltt_serialize_cb callbacks[LTT_NR_CALLBACKS];
-        struct cds_list_head node;          /* registered probes list */
-};
-
-extern int ltt_probe_register(struct ltt_available_probe *pdata); 
-extern int ltt_probe_unregister(struct ltt_available_probe *pdata); 
-extern int ltt_ust_marker_connect(const char *channel, const char *mname, 
-                const char *pname); 
-extern int ltt_ust_marker_disconnect(const char *channel, const char *mname, 
-                const char *pname);
-
-#endif /* _UST_PROBE_H */
+/*
+ * This whole file is currently a dummy.
+ */
+
+#include <stdio.h>
+
+#undef TRACEPOINT_EVENT
+#define TRACEPOINT_EVENT(name, proto, args, fields)			\
+	TRACEPOINT_EVENT_CLASS(name,					\
+			TP_PARAMS(proto),				\
+			TP_PARAMS(args),				\
+			TP_PARAMS(fields));				\
+	TRACEPOINT_EVENT_INSTANCE(name, name, TP_PARAMS(proto),		\
+			TP_PARAMS(args));
+
+#undef TRACEPOINT_EVENT_NOARGS
+#define TRACEPOINT_EVENT_NOARGS(name, fields)				\
+	TRACEPOINT_EVENT_CLASS_NOARGS(name,				\
+			TP_PARAMS(fields));				\
+	TRACEPOINT_EVENT_INSTANCE_NOARGS(name, name);
+
+#undef tp_field
+#define tp_field(type, item, src)	type	item;
+
+#undef TP_FIELDS
+#define TP_FIELDS(args...) args
+
+#undef TRACEPOINT_EVENT_INSTANCE
+#define TRACEPOINT_EVENT_INSTANCE(template, name, proto, args)
+
+#undef TRACEPOINT_EVENT_INSTANCE_NOARGS
+#define TRACEPOINT_EVENT_INSTANCE_NOARGS(template, name)
+
+#undef TRACEPOINT_EVENT_CLASS
+#define TRACEPOINT_EVENT_CLASS(name, proto, args, fields)		\
+	struct trace_raw_##name {					\
+		fields							\
+	};								\
+	static void trace_printf_##name(void *dummy, proto)		\
+	{								\
+	}								\
+	struct trace_event __event_##name = {				\
+		__tpstrtab_##name,					\
+	};								\
+	static struct trace_event * const __event_ptrs_##name		\
+	__attribute__((used, section("__trace_events_ptrs"))) =		\
+		&__event_##name;					\
+									\
+	static void __attribute__((constructor)) init_##name()		\
+	{								\
+		void *dummy = NULL;					\
+		__register_tracepoint(name, trace_printf_##name, dummy);\
+	}
+
+#undef TRACEPOINT_EVENT_CLASS_NOARGS
+#define TRACEPOINT_EVENT_CLASS_NOARGS(name, fields)			\
+	struct trace_raw_##name {					\
+		fields							\
+	};								\
+	static void trace_printf_##name(void *dummy)			\
+	{								\
+	}								\
+	struct trace_event __event_##name = {				\
+		__tpstrtab_##name,					\
+	};								\
+	static struct trace_event * const __event_ptrs_##name		\
+	__attribute__((used, section("__trace_events_ptrs"))) =		\
+		&__event_##name;					\
+									\
+	static void __attribute__((constructor)) init_##name()		\
+	{								\
+		void *dummy = NULL;					\
+		__register_tracepoint(name, trace_printf_##name, dummy);\
+	}
+
+#include TRACE_INCLUDE(TRACE_INCLUDE_FILE)