remove some unused code

diff --git a/include/ust/marker.h b/include/ust/marker.h
index 55900988028642192657dfc88948ce4f9355502c..0e0b466b994546337c61e3d95e7714837e8c49ad 100644 (file)
--- a/include/ust/marker.h
+++ b/include/ust/marker.h
@@ -25,17 +25,13 @@
 #define _UST_MARKER_H
 
 #include <stdarg.h>
-//ust// #include <linux/types.h>
 #include <ust/immediate.h>
-//ust// #include <linux/ltt-channels.h>
 #include <ust/kernelcompat.h>
 #include <urcu/list.h>
 #include <ust/processor.h>
 
 #include <bits/wordsize.h>
 
-//ust// struct module;
-//ust// struct task_struct;
 struct marker;
 
 /* To stringify the expansion of a define */
@@ -100,6 +96,7 @@ struct marker {
                      * is not unusual as it can be the result of function inlining.            \
                      */                                                                        \
                     ".ifndef __mstrtab_" XSTR(channel) "_" XSTR(name) "_channel_" XSTR(unique) "\n\t"  \
+                    /*".section __markers_strings\n\t"*/                                       \
                     ".section __markers_strings,\"aw\",@progbits\n\t"                          \
                     "__mstrtab_" XSTR(channel) "_" XSTR(name) "_channel_" XSTR(unique) ":\n\t" \
                     ".string \"" XSTR(channel) "\"\n\t"                                        \
@@ -111,6 +108,7 @@ struct marker {
                     ".endif\n\t"                                                               \
                );                                                                              \
                asm volatile (                                                                  \
+                    /*".section __markers\n\t"*/ \
                     ".section __markers,\"aw\",@progbits\n\t"                                  \
                     ".balign 8\n\t"                                                            \
                     "2:\n\t" \
@@ -140,8 +138,22 @@ struct marker {
 #define DEFINE_MARKER(channel, name, format, unique, m)                                \
                _DEFINE_MARKER(channel, name, NULL, NULL, format, unique, m)
 
-#define DEFINE_MARKER_TP(channel, name, tp_name, tp_cb, format, unique, m)             \
-               _DEFINE_MARKER(channel, name, #tp_name, tp_cb, format, unique, m)
+#define DEFINE_MARKER_TP(channel, name, tp_name, tp_cb, format)                \
+               _DEFINE_MARKER_TP(channel, name, #tp_name, tp_cb, format)
+
+#define _DEFINE_MARKER_TP(channel, name, tp_name_str, tp_cb, format) \
+               static const char __mstrtab_##channel##_##name[]        \
+               __attribute__((section("__markers_strings")))           \
+               = #channel "\0" #name "\0" format;                      \
+               static struct marker __mark_##channel##_##name          \
+               __attribute__((section("__markers"), aligned(8))) =     \
+               { __mstrtab_##channel##_##name,                         \
+                 &__mstrtab_##channel##_##name[sizeof(#channel)],      \
+                 &__mstrtab_##channel##_##name[sizeof(#channel) +      \
+                                               sizeof(#name)],         \
+                 0, 0, 0, 0, marker_probe_cb,                          \
+                 { __mark_empty_function, NULL},                       \
+                 NULL, tp_name_str, tp_cb }
 
 /*
  * Make sure the alignment of the structure in the __markers section will

diff --git a/include/ust/tracepoint.h b/include/ust/tracepoint.h
index 6da3097766c9d351c979aecf10daab52e8694b05..7db6ed3065e8f9e4316d6b5bbcff4b11f379bd71 100644 (file)
--- a/include/ust/tracepoint.h
+++ b/include/ust/tracepoint.h
@@ -48,8 +48,8 @@ struct tracepoint {
                                         * Keep in sync with vmlinux.lds.h.
                                         */
 
-#define TPPROTO(args...)       args
-#define TPARGS(args...)                args
+#define TP_PROTO(args...)      args
+#define TP_ARGS(args...)       args
 
 #define CONFIG_TRACEPOINTS
 #ifdef CONFIG_TRACEPOINTS
@@ -77,11 +77,11 @@ struct tracepoint {
                if (!generic) {                                         \
                        if (unlikely(imv_read(__tracepoint_##name.state))) \
                                __DO_TRACE(&__tracepoint_##name,        \
-                                       TPPROTO(proto), TPARGS(args));  \
+                                       TP_PROTO(proto), TP_ARGS(args));        \
                } else {                                                \
                        if (unlikely(_imv_read(__tracepoint_##name.state))) \
                                __DO_TRACE(&__tracepoint_##name,        \
-                                       TPPROTO(proto), TPARGS(args));  \
+                                       TP_PROTO(proto), TP_ARGS(args));        \
                }                                                       \
        } while (0)
 
@@ -99,11 +99,11 @@ struct tracepoint {
        extern struct tracepoint __tracepoint_##name;                   \
        static inline void trace_##name(proto)                          \
        {                                                               \
-               __CHECK_TRACE(name, 0, TPPROTO(proto), TPARGS(args));   \
+               __CHECK_TRACE(name, 0, TP_PROTO(proto), TP_ARGS(args)); \
        }                                                               \
        static inline void _trace_##name(proto)                         \
        {                                                               \
-               __CHECK_TRACE(name, 1, TPPROTO(proto), TPARGS(args));   \
+               __CHECK_TRACE(name, 1, TP_PROTO(proto), TP_ARGS(args)); \
        }                                                               \
        static inline int register_trace_##name(void (*probe)(proto))   \
        {                                                               \
@@ -121,11 +121,6 @@ struct tracepoint {
        __attribute__((section("__tracepoints"), aligned(32))) =        \
                { __tpstrtab_##name, 0, NULL }
 
-#define EXPORT_TRACEPOINT_SYMBOL_GPL(name)                             \
-       EXPORT_SYMBOL_GPL(__tracepoint_##name)
-#define EXPORT_TRACEPOINT_SYMBOL(name)                                 \
-       EXPORT_SYMBOL(__tracepoint_##name)
-
 extern void tracepoint_update_probe_range(struct tracepoint *begin,
        struct tracepoint *end);
 

diff --git a/libust/tracepoint.c b/libust/tracepoint.c
index 20c4767c7e0dc2c877d38dfad53ab049502302e4..dd2ad7fae24fcc37615db05bda2e6a917e2889e6 100644 (file)
--- a/libust/tracepoint.c
+++ b/libust/tracepoint.c
@@ -19,23 +19,11 @@
  * Ported to userspace by Pierre-Marc Fournier.
  */
 
-//ust// #include <linux/module.h>
-//ust// #include <linux/mutex.h>
-//ust// #include <linux/types.h>
-//ust// #include <linux/jhash.h>
-//ust// #include <linux/list.h>
-//ust// #include <linux/rcupdate.h>
-//ust// #include <linux/tracepoint.h>
-//ust// #include <linux/err.h>
-//ust// #include <linux/slab.h>
-//ust// #include <linux/immediate.h>
-
 #include <errno.h>
 
 #include <ust/kernelcompat.h>
 #include <ust/tracepoint.h>
 #include "usterr.h"
-//#include "list.h"
 
 #define _LGPL_SOURCE
 #include <urcu-bp.h>