Re: [PATCH 09/11] dynamic_debug: consolidate repetitive struct _ddebug descriptor definitions

Joe Perches
2011-08-11T19:02:11Z

On Thu, 2011-08-11 at 14:36 -0400, Jason Baron wrote:
> From: Jason Baron <jbaron@redhat.com>
> Replace the repetitive struct _ddebug descriptor definitions with
> a new DYNAMIC_DEBUG_META_DATA(fmt) macro.

Hey Jason.

I think some improvements can be made to this one.

> diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h
[]
> @@ -54,33 +54,28 @@ extern int __dynamic_netdev_dbg(struct _ddebug *descriptor,
> const char *fmt, ...)
> __attribute__ ((format (printf, 3, 4)));
>
> +#define DYNAMIC_DEBUG_METADATA(fmt) \
> + static struct _ddebug descriptor \
> + __used \
> + __attribute__((section("__verbose"), aligned(8))) = \
> + { KBUILD_MODNAME, __func__, __FILE__, fmt, __LINE__, \
> + _DPRINTK_FLAGS_DEFAULT };
> +

I think this is unclear and should be:

#define DECLARE_DYNAMIC_DEBUG_METADATA(name, fmt) \
static struct _ddebug name \
__used \
__attribute__((section("__verbose"), aligned(8))) = \
{ KBUILD_MODNAME, __func__, __FILE__, fmt, __LINE__, \
_DPRINTK_FLAGS_DEFAULT }

(extra semicolon at end removed)

so the uses become:

> #define dynamic_dev_dbg(dev, fmt, ...) do { \
> - static struct _ddebug descriptor \
> - __used \
> - __attribute__((section("__verbose"), aligned(8))) = \
> - { KBUILD_MODNAME, __func__, __FILE__, fmt, __LINE__, \
> - _DPRINTK_FLAGS_DEFAULT }; \
> + DYNAMIC_DEBUG_METADATA(fmt); \

DECLARE_DYNAMIC_DEBUG_METADATA(descriptor, fmt);

> if (unlikely(descriptor.enabled)) \
> - __dynamic_dev_dbg(&descriptor, dev, fmt, ##__VA_ARGS__); \
> + __dynamic_dev_dbg(&descriptor, dev, fmt, ##__VA_ARGS__);\
> } while (0)

so then there aren't any magic variable names.

cheers, Joe