Merge branch 'for-pierre-marc' of git://git.infradead.org/users/jblunck/ust

[ust.git] / include / ust / marker.h

diff --git a/include/ust/marker.h b/include/ust/marker.h
index 2b5a0c38ba701dfe6f1874eecee097b6bbd47e5a..5c7d1b362b7b3f22dd153d1bdefab7ac3c09ee46 100644 (file)
--- a/include/ust/marker.h
+++ b/include/ust/marker.h
@@ -30,6 +30,7 @@
 //ust// #include <linux/ltt-channels.h>
 #include <ust/kernelcompat.h>
 #include <kcompat/list.h>
+#include "processor.h"
 
 //ust// struct module;
 //ust// struct task_struct;
@@ -49,7 +50,7 @@ struct marker;
  * format string to recover the variable argument list.
  */
 typedef void marker_probe_func(const struct marker *mdata,
-               void *probe_private, void *call_private,
+               void *probe_private, struct registers *regs, void *call_private,
                const char *fmt, va_list *args);
 
 struct marker_probe_closure {
@@ -68,11 +69,12 @@ struct marker {
                                /* Probe wrapper */
        u16 channel_id;         /* Numeric channel identifier, dynamic */
        u16 event_id;           /* Numeric event identifier, dynamic */
-       void (*call)(const struct marker *mdata, void *call_private, ...);
+       void (*call)(const struct marker *mdata, void *call_private, struct registers *regs, ...);
        struct marker_probe_closure single;
        struct marker_probe_closure *multi;
        const char *tp_name;    /* Optional tracepoint name */
        void *tp_cb;            /* Optional tracepoint callback */
+       void *location;         /* Address of marker in code */
 } __attribute__((aligned(8)));
 
 #define CONFIG_MARKERS
@@ -82,6 +84,7 @@ struct marker {
                static const char __mstrtab_##channel##_##name[]        \
                __attribute__((section("__markers_strings")))           \
                = #channel "\0" #name "\0" format;                      \
+               struct registers regs;                                  \
                static struct marker __mark_##channel##_##name          \
                __attribute__((section("__markers"), aligned(8))) =     \
                { __mstrtab_##channel##_##name,                         \
@@ -90,7 +93,15 @@ struct marker {
                                                sizeof(#name)],         \
                  0, 0, 0, 0, marker_probe_cb,                          \
                  { __mark_empty_function, NULL},                       \
-                 NULL, tp_name_str, tp_cb }
+                 NULL, tp_name_str, tp_cb, NULL };                     \
+               asm (".section __marker_addr,\"aw\",@progbits\n\t"      \
+                      _ASM_PTR "%c[marker_struct], (1f)\n\t"           \
+                      ".previous\n\t"                                  \
+                      "1:\n\t"                                         \
+                       :: [marker_struct] "i" (&__mark_##channel##_##name));\
+               save_registers(&regs)
+
+
 
 #define DEFINE_MARKER(channel, name, format)                           \
                _DEFINE_MARKER(channel, name, NULL, NULL, format)
@@ -116,13 +127,13 @@ struct marker {
                                        __mark_##channel##_##name.state))) \
                                (*__mark_##channel##_##name.call)       \
                                        (&__mark_##channel##_##name,    \
-                                       call_private, ## args);         \
+                                       call_private, &regs, ## args);          \
                } else {                                                \
                        if (unlikely(_imv_read(                         \
                                        __mark_##channel##_##name.state))) \
                                (*__mark_##channel##_##name.call)       \
                                        (&__mark_##channel##_##name,    \
-                                       call_private, ## args);         \
+                                       call_private, &regs, ## args);          \
                }                                                       \
        } while (0)
 
@@ -136,7 +147,7 @@ struct marker {
                DEFINE_MARKER_TP(channel, name, tp_name, tp_cb, format);\
                __mark_check_format(format, ## args);                   \
                (*__mark_##channel##_##name.call)(&__mark_##channel##_##name, \
-                       call_private, ## args);                         \
+                       call_private, &regs, ## args);                          \
        } while (0)
 
 extern void marker_update_probe_range(struct marker *begin,
@@ -230,7 +241,7 @@ static inline void __printf(1, 2) ___mark_check_format(const char *fmt, ...)
 extern marker_probe_func __mark_empty_function;
 
 extern void marker_probe_cb(const struct marker *mdata,
-       void *call_private, ...);
+       void *call_private, struct registers *regs, ...);
 
 /*
  * Connect a probe to a marker.
@@ -286,23 +297,29 @@ extern int is_marker_enabled(const char *channel, const char *name);
 //ust// }
 //ust// #endif
 
+struct marker_addr {
+       struct marker *marker;
+       void *addr;
+};
 
 struct lib {
        struct marker *markers_start;
+       struct marker_addr *markers_addr_start;
        int markers_count;
        struct list_head list;
 };
 
-extern int marker_register_lib(struct marker *markers_start,
-                              int markers_count);
-
-#define MARKER_LIB                                                     \
-extern struct marker __start___markers[] __attribute__((visibility("hidden")));        \
-extern struct marker __stop___markers[] __attribute__((visibility("hidden")));         \
-                                                                                       \
-static void __attribute__((constructor)) __markers__init(void)                                 \
-{                                                                                      \
-       marker_register_lib(__start___markers, (((long)__stop___markers)-((long)__start___markers))/sizeof(struct marker));\
+extern int marker_register_lib(struct marker *markers_start, struct marker_addr *marker_addr_start, int markers_count);
+
+#define MARKER_LIB                                                                             \
+extern struct marker __start___markers[] __attribute__((visibility("hidden")));                        \
+extern struct marker __stop___markers[] __attribute__((visibility("hidden")));                 \
+extern struct marker_addr __start___marker_addr[] __attribute__((visibility("hidden")));       \
+extern struct marker_addr __stop___marker_addr[] __attribute__((visibility("hidden")));                \
+                                                                                               \
+static void __attribute__((constructor)) __markers__init(void)                                 \
+{                                                                                              \
+       marker_register_lib(__start___markers, __start___marker_addr, (((long)__stop___markers)-((long)__start___markers))/sizeof(struct marker)); \
 }
 
 extern void marker_set_new_marker_cb(void (*cb)(struct marker *));