Re: [PATCH 24/25] dynamic_debug: drop pr_fmt() fromdynamic_pr_debug

[Joe Perches]

On Mon, 2011-07-25 at 15:42 -0600, Jim Cromie wrote:
> dynamic_pr_debug can add module, function, file, and line selectively,
> theres no need to also add them via macro.  Moreover, adding them
> via the macro, which is useful for pr_info and friends, causes
> pr_debug to double-print those fields added by the flag-settings.
[]
> -		__dynamic_pr_debug(&descriptor, pr_fmt(fmt), ##__VA_ARGS__);\
> +		__dynamic_pr_debug(&descriptor, fmt, ##__VA_ARGS__);	\

Hey Jim.

Thinking about a bit more, maybe it's possible to use
another test to see if the current pr_fmt is:

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

and not add pr_fmt when appropriate.

I tried this once.  I recall it worked without adding any
new string dependencies.   It did depend on __builtin_strcmp.

+#define _first_macro_arg(arg1, args...) arg1
+#define first_macro_arg(arg1, args...) _first_macro_arg(arg1)
+
+#define define_kernel_printk_level(level, fmt, ...)                    \
+do {                                                                   \
+       if (__builtin_strcmp(first_macro_arg(pr_fmt(fmt)),              \
+                            KBUILD_MODNAME ": " fmt))                  \
+               printk(level pr_fmt(fmt), ##__VA_ARGS__);               \
+       else                                                            \
+               printk(level fmt, ##__VA_ARGS__);                       \
+} while (0)



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/