Skip to contentSkip to conversation

Linux Kernel Markers - if check format

PATCH In review Mathieu Desnoyers 2 participants 2 messages Feb 28, 2008

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Linux Kernel Markers - if check format

Wrap __mark_check_format() into an if(0) to make sure that parameters such as

trace_mark(mm_page_alloc, "order %u pfn %lu", order, page?page_to_pfn(page):0);

(where page_to_pfn() has side-effects) won't generate code because of the __mark_check_format().

Thanks to Jan Kiszka for reporting this.

CC Jan Kiszka <[email protected]>
CC "Frank Ch. Eigler" <[email protected]>
---
 include/linux/marker.h |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
include/linux/marker.h +7 -1
Index: linux-2.6-lttng/include/linux/marker.h
===================================================================
@@ -104,10 +104,16 @@ static inline void marker_update_probe_r
 #define MARK_NOARGS " "
 
 /* To be used for string format validity checking with gcc */
-static inline void __printf(1, 2) __mark_check_format(const char *fmt, ...)
+static inline void __printf(1, 2) ___mark_check_format(const char *fmt, ...)
 {
 }
 
+#define __mark_check_format(format, args...)				\
+	do {								\
+		if (0)							\
+			___mark_check_format(format, ## args);		\
+	} while (0)
+
 extern marker_probe_func __mark_empty_function;
 
 extern void marker_probe_cb(const struct marker *mdata,
Signature · 3 lines
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68
#1 lore raw
Quoted 1 line · On Wed, 27 Feb 2008 23:54:33 -0500 Mathieu Desnoyers…

Subject: [PATCH] Linux Kernel Markers - if check format

err, that's not very comprehensible. I changed it to "markers: add an if(0) to __mark_check_format()".

I think "Linux Kernel Markers" is an excessivelt elaborate subsystem
identifier, btw. Plain old "markers" will suffice ;)