projects
/
ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Large cleanup, mostly removal of all printk's and printfs in libust
[ust.git]
/
include
/
ust
/
marker.h
diff --git
a/include/ust/marker.h
b/include/ust/marker.h
index 18628ccde200375ae7a08fe62ad07e6d5916d448..641df8fd6f9460d3ff667479d58b991604f504d7 100644
(file)
--- a/
include/ust/marker.h
+++ b/
include/ust/marker.h
@@
-32,6
+32,8
@@
#include <kcompat/list.h>
#include <ust/processor.h>
#include <kcompat/list.h>
#include <ust/processor.h>
+#include <bits/wordsize.h>
+
//ust// struct module;
//ust// struct task_struct;
struct marker;
//ust// struct module;
//ust// struct task_struct;
struct marker;
@@
-105,7
+107,7
@@
struct marker {
".align 8\n\t" \
XSTR(make_mark_struct_name(channel, name, unique)) ":\n\t" \
".global " XSTR(make_mark_struct_name(channel, name, unique)) "\n\t" \
".align 8\n\t" \
XSTR(make_mark_struct_name(channel, name, unique)) ":\n\t" \
".global " XSTR(make_mark_struct_name(channel, name, unique)) "\n\t" \
- ".
hidden " XSTR(make_mark_struct_name(channel, name, unique)) "\n\t"
\
+ ".
local " XSTR(make_mark_struct_name(channel, name, unique)) "\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 */ \
_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 */ \
@@
-113,7
+115,7
@@
struct marker {
".byte 0\n\t" /* ptype */ \
".word 0\n\t" /* channel_id */ \
".word 0\n\t" /* event_id */ \
".byte 0\n\t" /* ptype */ \
".word 0\n\t" /* channel_id */ \
".word 0\n\t" /* event_id */ \
- ".align " XSTR(__
SIZEOF_POINTER__) "\n\t" /* alignment */
\
+ ".align " 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 "(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 */ \
@@
-152,7
+154,7
@@
struct marker {
__mark_struct_##channel##_##name##_##unique
#define __trace_mark(generic, channel, name, call_private, format, args...) \
__mark_struct_##channel##_##name##_##unique
#define __trace_mark(generic, channel, name, call_private, format, args...) \
- __trace_mark_counter(generic, channel, name, __
COUNTER
__, call_private, format, ## args)
+ __trace_mark_counter(generic, channel, name, __
LINE
__, call_private, format, ## args)
#define __trace_mark_counter(generic, channel, name, unique, call_private, format, args...) \
do { \
#define __trace_mark_counter(generic, channel, name, unique, call_private, format, args...) \
do { \
@@
-174,7
+176,7
@@
struct marker {
} while (0)
#define __trace_mark_tp(channel, name, call_private, tp_name, tp_cb, format, args...) \
} while (0)
#define __trace_mark_tp(channel, name, call_private, tp_name, tp_cb, format, args...) \
- __trace_mark_tp_counter(channel, name, __
COUNTER
__, call_private, tp_name, tp_cb, format, ## args)
+ __trace_mark_tp_counter(channel, name, __
LINE
__, call_private, tp_name, tp_cb, format, ## args)
#define __trace_mark_tp_counter(channel, name, unique, call_private, tp_name, tp_cb, format, args...) \
do { \
#define __trace_mark_tp_counter(channel, name, unique, call_private, tp_name, tp_cb, format, args...) \
do { \
@@
-234,8
+236,7
@@
static inline void marker_update_probe_range(struct marker *begin,
*
* Places a marker using a standard memory read (_imv_read()) to be
* enabled. Should be used for markers in code paths where instruction
*
* Places a marker using a standard memory read (_imv_read()) to be
* enabled. Should be used for markers in code paths where instruction
- * modification based enabling is not welcome. (__init and __exit functions,
- * lockdep, some traps, printk).
+ * modification based enabling is not welcome.
*/
#define _trace_mark(channel, name, format, args...) \
__trace_mark(1, channel, name, NULL, format, ## args)
*/
#define _trace_mark(channel, name, format, args...) \
__trace_mark(1, channel, name, NULL, format, ## args)
This page took
0.025767 seconds
and
4
git commands to generate.