Trace event: export pointer array

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

diff --git a/include/ust/tracepoint.h b/include/ust/tracepoint.h
index 05e5c11dd902c0c01ae2713b3d1d44952fd9dcc5..8be8697942f567c6890735ae4dc93bfb62df6bf7 100644 (file)
--- a/include/ust/tracepoint.h
+++ b/include/ust/tracepoint.h
@@ -339,17 +339,17 @@ struct trace_event {
        const char *name;
        int (*regfunc)(void *data);
        int (*unregfunc)(void *data);
-} __attribute__((aligned(32)));
+};
 
 struct trace_event_lib {
-       struct trace_event *trace_events_start;
+       struct trace_event * const *trace_events_start;
        int trace_events_count;
        struct cds_list_head list;
 };
 
 struct trace_event_iter {
        struct trace_event_lib *lib;
-       struct trace_event *trace_event;
+       struct trace_event * const *trace_event;
 };
 
 extern void lock_trace_events(void);
@@ -359,37 +359,35 @@ extern void trace_event_iter_start(struct trace_event_iter *iter);
 extern void trace_event_iter_next(struct trace_event_iter *iter);
 extern void trace_event_iter_reset(struct trace_event_iter *iter);
 
-extern int trace_event_get_iter_range(struct trace_event **trace_event,
-                                     struct trace_event *begin,
-                                     struct trace_event *end);
+extern int trace_event_get_iter_range(struct trace_event * const **trace_event,
+                                     struct trace_event * const *begin,
+                                     struct trace_event * const *end);
 
 extern void trace_event_update_process(void);
 extern int is_trace_event_enabled(const char *channel, const char *name);
 
-extern int trace_event_register_lib(struct trace_event *start_trace_events,
+extern int trace_event_register_lib(struct trace_event * const *start_trace_events,
                                    int trace_event_count);
 
-extern int trace_event_unregister_lib(struct trace_event *start_trace_events);
+extern int trace_event_unregister_lib(struct trace_event * const *start_trace_events);
 
 #define TRACE_EVENT_LIB                                                        \
-       extern struct trace_event __start___trace_events[]              \
+       extern struct trace_event * const __start___trace_events_ptrs[] \
        __attribute__((weak, visibility("hidden")));                    \
-       extern struct trace_event __stop___trace_events[]               \
+       extern struct trace_event * const __stop___trace_events_ptrs[]  \
        __attribute__((weak, visibility("hidden")));                    \
        static void __attribute__((constructor))                        \
        __trace_events__init(void)                                      \
        {                                                               \
-               long trace_event_count =((long)__stop___trace_events-   \
-                                        (long)__start___trace_events)  \
-                       /sizeof(struct trace_event);                    \
-               trace_event_register_lib(__start___trace_events,        \
-                                        trace_event_count);            \
+               trace_event_register_lib(__start___trace_events_ptrs,   \
+                                        __stop___trace_events_ptrs -   \
+                                        __start___trace_events_ptrs);  \
        }                                                               \
                                                                        \
        static void __attribute__((destructor))                         \
        __trace_event__destroy(void)                                    \
        {                                                               \
-               trace_event_unregister_lib(__start___trace_events);     \
+               trace_event_unregister_lib(__start___trace_events_ptrs);\
        }
 
 #define DECLARE_TRACE_EVENT_CLASS(name, proto, args, tstruct, assign, print)