#include <stdarg.h>
#include <ust/immediate.h>
-#include <ust/kernelcompat.h>
+#include <ust/core.h>
#include <urcu/list.h>
#include <ust/processor.h>
+#include <ust/kcompat/kcompat.h>
+#include <ust/kcompat/stringify.h>
#include <bits/wordsize.h>
struct marker;
-/* To stringify the expansion of a define */
-#define XSTR(d) STR(d)
-#define STR(s) #s
-
/**
* marker_probe_func - Type of a marker probe function
* @mdata: marker data
const char *format; /* Marker format string, describing the
* variable argument list.
*/
- DEFINE_IMV(char, state);/* Immediate value state. */
+ DEFINE_IMV(char, state);/* Immediate value state. */
char ptype; /* probe type : 0 : single, 1 : multi */
/* Probe wrapper */
u16 channel_id; /* Numeric channel identifier, dynamic */
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(name) (__mark_ust_##name)
#define _DEFINE_MARKER(channel, name, tp_name_str, tp_cb, format, unique, m) \
- struct registers regs; \
+ struct registers __marker_regs; \
\
/* This next asm has to be a basic inline asm (no input/output/clobber), \
* because it must not require %-sign escaping, as we most certainly \
* have some %-signs in the format string. \
*/ \
- asm volatile ( \
- /* We only define these symbols if they have not yet been defined. Indeed, \
- * if two markers with the same channel/name are on the same line, they \
- * will try to create the same symbols, resulting in a conflict. This \
- * 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" \
- "__mstrtab_" XSTR(channel) "_" XSTR(name) "_name_" XSTR(unique) ":\n\t" \
- ".string \"" XSTR(name) "\"\n\t" \
- "__mstrtab_" XSTR(channel) "_" XSTR(name) "_format_" XSTR(unique) ":\n\t" \
- ".string " "\"" format "\"" "\n\t" \
- ".previous\n\t" \
- ".endif\n\t" \
+ asm volatile ( \
+ /* We only define these symbols if they have not yet been defined. Indeed, \
+ * if two markers with the same channel/name are on the same line, they \
+ * will try to create the same symbols, resulting in a conflict. This \
+ * is not unusual as it can be the result of function inlining. \
+ */ \
+ ".ifndef __mstrtab_" __stringify(channel) "_" __stringify(name) "_channel_" __stringify(unique) "\n\t" \
+ /*".section __markers_strings\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" \
+ ".string \"" __stringify(name) "\"\n\t" \
+ "__mstrtab_" __stringify(channel) "_" __stringify(name) "_format_" __stringify(unique) ":\n\t" \
+ ".string " "\"" format "\"" "\n\t" \
+ ".previous\n\t" \
+ ".endif\n\t" \
); \
asm volatile ( \
- /*".section __markers\n\t"*/ \
- ".section __markers,\"aw\",@progbits\n\t" \
- ".balign 8\n\t" \
- "2:\n\t" \
- _ASM_PTR "(__mstrtab_" XSTR(channel) "_" XSTR(name) "_channel_" XSTR(unique) ")\n\t" /* channel string */ \
- _ASM_PTR "(__mstrtab_" XSTR(channel) "_" XSTR(name) "_name_" XSTR(unique) ")\n\t" /* name string */ \
- _ASM_PTR "(__mstrtab_" XSTR(channel) "_" XSTR(name) "_format_" XSTR(unique) ")\n\t" /* format string */ \
- ".byte 0\n\t" /* state imv */ \
- ".byte 0\n\t" /* ptype */ \
- ".word 0\n\t" /* channel_id */ \
- ".word 0\n\t" /* event_id */ \
- ".balign " XSTR(__WORDSIZE) " / 8\n\t" /* alignment */ \
- _ASM_PTR "(marker_probe_cb)\n\t" /* call */ \
- _ASM_PTR "(__mark_empty_function)\n\t" /* marker_probe_closure single.field1 */ \
- _ASM_PTR "0\n\t" /* marker_probe_closure single.field2 */ \
- _ASM_PTR "0\n\t" /* marker_probe_closure *multi */ \
- _ASM_PTR "0\n\t" /* tp_name */ \
- _ASM_PTR "0\n\t" /* tp_cb */ \
- _ASM_PTR "(1f)\n\t" /* location */ \
- ".previous\n\t" \
- ARCH_COPY_ADDR("%[outptr]") \
- "1:\n\t" \
+ /*".section __markers\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 "(__mstrtab_" __stringify(channel) "_" __stringify(name) "_format_" __stringify(unique) ")\n\t" /* format string */ \
+ ".byte 0\n\t" /* state imv */ \
+ ".byte 0\n\t" /* ptype */ \
+ ".hword 0\n\t" /* channel_id */ \
+ ".hword 0\n\t" /* event_id */ \
+ ".balign " __stringify(__WORDSIZE) " / 8\n\t" /* alignment */ \
+ _ASM_PTR "(marker_probe_cb)\n\t" /* call */ \
+ _ASM_PTR "(__mark_empty_function)\n\t" /* marker_probe_closure single.field1 */ \
+ _ASM_PTR "0\n\t" /* marker_probe_closure single.field2 */ \
+ _ASM_PTR "0\n\t" /* marker_probe_closure *multi */ \
+ _ASM_PTR "0\n\t" /* tp_name */ \
+ _ASM_PTR "0\n\t" /* tp_cb */ \
+ _ASM_PTR "(1f)\n\t" /* location */ \
+ ".previous\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) ); \
\
- save_registers(®s)
+ save_registers(&__marker_regs)
-#define DEFINE_MARKER(channel, name, format, unique, m) \
- _DEFINE_MARKER(channel, name, NULL, NULL, format, unique, m)
+#define DEFINE_MARKER(name, format, unique, m) \
+ _DEFINE_MARKER(ust, name, NULL, NULL, 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(name, tp_name, tp_cb, format) \
+ _DEFINE_MARKER_TP(ust, 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))) = \
+ __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 }
+ &__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 }; \
+ static struct marker * const __mark_ptr_##channel##_##name \
+ __attribute__((used, section("__markers_ptrs"))) = \
+ &__mark_##channel##_##name;
/*
* Make sure the alignment of the structure in the __markers section will
#define __trace_mark_counter(generic, channel, name, unique, call_private, format, args...) \
do { \
- struct marker *m; \
- DEFINE_MARKER(channel, name, format, unique, m); \
+ struct marker *__marker_counter_ptr; \
+ _DEFINE_MARKER(channel, name, NULL, NULL, format, unique, __marker_counter_ptr); \
__mark_check_format(format, ## args); \
if (!generic) { \
- if (unlikely(imv_read(m->state))) \
- (m->call)(m, call_private, ®s, ## args); \
+ if (unlikely(imv_read(__marker_counter_ptr->state))) \
+ (__marker_counter_ptr->call)(__marker_counter_ptr, call_private, &__marker_regs, ## args); \
} else { \
- if (unlikely(_imv_read(m->state))) \
- (m->call)(m, call_private, ®s, ## args); \
+ if (unlikely(_imv_read(__marker_counter_ptr->state))) \
+ (__marker_counter_ptr->call)(__marker_counter_ptr, call_private, &__marker_regs, ## args); \
} \
} while (0)
#define __trace_mark_tp_counter(channel, name, unique, call_private, tp_name, tp_cb, format, args...) \
do { \
- struct marker m; \
+ struct registers __marker_regs; \
void __check_tp_type(void) \
{ \
- register_trace_##tp_name(tp_cb); \
+ register_trace_##tp_name(tp_cb, call_private); \
} \
- DEFINE_MARKER_TP(channel, name, tp_name, tp_cb, format, unique, m);\
+ _DEFINE_MARKER_TP(channel, name, #tp_name, tp_cb, format); \
__mark_check_format(format, ## args); \
- (*__mark_##channel##_##name.call)(&__mark_##channel##_##name, \
- call_private, ®s, ## args); \
+ (*__mark_##channel##_##name.call)(&__mark_##channel##_##name, \
+ call_private, &__marker_regs, ## args); \
} while (0)
-extern void marker_update_probe_range(struct marker *begin,
- struct marker *end);
-
-#define GET_MARKER(channel, name) (__mark_##channel##_##name)
-
-#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); \
- } \
- __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
- * @channel: marker channel (where to send the data), not quoted.
* @name: marker name, not quoted.
* @format: format string
* @args...: variable argument list
* Places a marker using optimized code patching technique (imv_read())
* to be enabled when immediate values are present.
*/
-#define trace_mark(channel, name, format, args...) \
- __trace_mark(0, channel, name, NULL, format, ## args)
+#define trace_mark(name, format, args...) \
+ __trace_mark(0, ust, name, NULL, format, ## args)
/**
* _trace_mark - Marker using variable read
- * @channel: marker channel (where to send the data), not quoted.
* @name: marker name, not quoted.
* @format: format string
* @args...: variable argument list
* enabled. Should be used for markers in code paths where instruction
* modification based enabling is not welcome.
*/
-#define _trace_mark(channel, name, format, args...) \
- __trace_mark(1, channel, name, NULL, format, ## args)
+#define _trace_mark(name, format, args...) \
+ __trace_mark(1, ust, name, NULL, format, ## args)
/**
* trace_mark_tp - Marker in a tracepoint callback
- * @channel: marker channel (where to send the data), not quoted.
* @name: marker name, not quoted.
* @tp_name: tracepoint name, not quoted.
* @tp_cb: tracepoint callback. Should have an associated global symbol so it
*
* Places a marker in a tracepoint callback.
*/
-#define trace_mark_tp(channel, name, tp_name, tp_cb, format, args...) \
- __trace_mark_tp(channel, name, NULL, tp_name, tp_cb, format, ## args)
+#define trace_mark_tp(name, tp_name, tp_cb, format, args...) \
+ __trace_mark_tp(ust, name, NULL, tp_name, tp_cb, format, ## args)
/**
* MARK_NOARGS - Format string for a marker with no argument.
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 struct marker * const __mark_ptr_dummy \
+ __attribute__((used, section("__markers_ptrs"))) = NULL;\
\
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