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
-#ifdef CONFIG_MARKERS
+};
#define GET_MARKER(channel, name) (__mark_##channel##_##name)
*/ \
".ifndef __mstrtab_" __stringify(channel) "_" __stringify(name) "_channel_" __stringify(unique) "\n\t" \
/*".section __markers_strings\n\t"*/ \
- ".section __markers_strings,\"aw\",@progbits\n\t" \
+ ".section __markers_strings,\"aw\"\n\t" \
"__mstrtab_" __stringify(channel) "_" __stringify(name) "_channel_" __stringify(unique) ":\n\t" \
".string \"" __stringify(channel) "\"\n\t" \
"__mstrtab_" __stringify(channel) "_" __stringify(name) "_name_" __stringify(unique) ":\n\t" \
); \
asm volatile ( \
/*".section __markers\n\t"*/ \
- ".section __markers,\"aw\",@progbits\n\t" \
- ".balign 8\n\t" \
+ ".section __markers,\"aw\"\n\t" \
"2:\n\t" \
_ASM_PTR "(__mstrtab_" __stringify(channel) "_" __stringify(name) "_channel_" __stringify(unique) ")\n\t" /* channel string */ \
_ASM_PTR "(__mstrtab_" __stringify(channel) "_" __stringify(name) "_name_" __stringify(unique) ")\n\t" /* name string */ \
_ASM_PTR "0\n\t" /* tp_cb */ \
_ASM_PTR "(1f)\n\t" /* location */ \
".previous\n\t" \
- "1:\n\t" \
+ /*".section __markers_ptrs\n\t"*/ \
+ ".section __markers_ptrs,\"a\"\n\t" \
+ _ASM_PTR "(2b)\n\t" \
+ ".previous\n\t" \
+ "1:\n\t" \
ARCH_COPY_ADDR("%[outptr]") \
: [outptr] "=r" (m) ); \
\
__attribute__((section("__markers_strings"))) \
= #channel "\0" #name "\0" format; \
static struct marker GET_MARKER(channel, name) \
- __attribute__((section("__markers"), aligned(8))) = \
+ __attribute__((section("__markers"))) = \
{ __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 }
+ NULL, tp_name_str, tp_cb }; \
+ static struct marker * const __mark_ptr_##channel##_##name \
+ __attribute__((used, section("__markers_ptrs"))) = \
+ &GET_MARKER(channel, name);
/*
* Make sure the alignment of the structure in the __markers section will
call_private, ®s, ## args); \
} while (0)
-extern void marker_update_probe_range(struct marker *begin,
- struct marker *end);
-
-#else /* !CONFIG_MARKERS */
-#define DEFINE_MARKER(channel, name, tp_name, tp_cb, format, m)
-#define __trace_mark(generic, channel, name, call_private, format, args...) \
- __mark_check_format(format, ## args)
-#define __trace_mark_tp(channel, name, call_private, tp_name, tp_cb, \
- format, args...) \
- do { \
- void __check_tp_type(void) \
- { \
- register_trace_##tp_name(tp_cb, call_private); \
- } \
- __mark_check_format(format, ## args); \
- } while (0)
-static inline void marker_update_probe_range(struct marker *begin,
- struct marker *end)
-{ }
-#define GET_MARKER(channel, name)
-#endif /* CONFIG_MARKERS */
+extern void marker_update_probe_range(struct marker * const *begin,
+ struct marker * const *end);
/**
* trace_mark - Marker using code patching
struct marker_iter {
//ust// struct module *module;
struct lib *lib;
- struct marker *marker;
+ struct marker * const *marker;
};
extern void marker_iter_start(struct marker_iter *iter);
extern void marker_iter_next(struct marker_iter *iter);
extern void marker_iter_stop(struct marker_iter *iter);
extern void marker_iter_reset(struct marker_iter *iter);
-extern int marker_get_iter_range(struct marker **marker, struct marker *begin,
- struct marker *end);
+extern int marker_get_iter_range(struct marker * const **marker, struct marker * const *begin,
+ struct marker * const *end);
extern void marker_update_process(void);
extern int is_marker_enabled(const char *channel, const char *name);
};
struct lib {
- struct marker *markers_start;
+ struct marker * const *markers_start;
#ifdef CONFIG_UST_GDB_INTEGRATION
struct marker_addr *markers_addr_start;
#endif
int markers_count;
- struct list_head list;
+ struct cds_list_head list;
};
-extern int marker_register_lib(struct marker *markers_start, int markers_count);
-extern int marker_unregister_lib(struct marker *markers_start);
+extern int marker_register_lib(struct marker * const *markers_start, int markers_count);
+extern int marker_unregister_lib(struct marker * const *markers_start);
#define MARKER_LIB \
- extern struct marker __start___markers[] __attribute__((weak, visibility("hidden"))); \
- extern struct marker __stop___markers[] __attribute__((weak, visibility("hidden"))); \
+ extern struct marker * const __start___markers_ptrs[] __attribute__((weak, visibility("hidden"))); \
+ extern struct marker * const __stop___markers_ptrs[] __attribute__((weak, visibility("hidden"))); \
\
static void __attribute__((constructor)) __markers__init(void) \
{ \
- marker_register_lib(__start___markers, (((long)__stop___markers)-((long)__start___markers))/sizeof(struct marker)); \
- } \
- \
- static void __attribute__((destructor)) __markers__destroy(void) \
+ marker_register_lib(__start___markers_ptrs, \
+ __stop___markers_ptrs \
+ - __start___markers_ptrs); \
+ } \
+ \
+ static void __attribute__((destructor)) __markers__destroy(void)\
{ \
- marker_unregister_lib(__start___markers); \
+ marker_unregister_lib(__start___markers_ptrs); \
}
extern void marker_set_new_marker_cb(void (*cb)(struct marker *));
projects / ust.git / blobdiff