Skip to content
Permalink
Browse files
dyndbg: s/dynamic_/ddebug_/
Modify last commit, renaming its "dynamic_" name additions to
"ddebug_", which is less generic, specific to dynamic_debug.c, and
therefore less ambiguous.  None of these names is exposed outside the
file.

no functional changes
  • Loading branch information
jimc committed Jan 22, 2022
1 parent e60a9cd commit f5b0d82213a36476415ce55e223acd3ee8e7fcf8
Showing 1 changed file with 21 additions and 21 deletions.
@@ -638,46 +638,46 @@ static inline char *dynamic_emit_prefix(struct _ddebug *desc, char *buf)
*/
#define DYNAMIC_TRACE_NESTING 4

struct dynamic_trace_buf {
struct ddebug_trace_buf {
char buf[256];
};

struct dynamic_trace_bufs {
struct ddebug_trace_bufs {
struct dynamic_trace_buf bufs[DYNAMIC_TRACE_NESTING];
};

static DEFINE_PER_CPU(struct dynamic_trace_bufs, dynamic_trace_bufs);
static DEFINE_PER_CPU(int, dynamic_trace_reserve);
static DEFINE_PER_CPU(struct ddebug_trace_bufs, ddebug_trace_bufs);
static DEFINE_PER_CPU(int, ddebug_trace_reserve);

static void dynamic_trace(const char *fmt, va_list args)
static void ddebug_trace(const char *fmt, va_list args)
{
struct dynamic_trace_buf *buf;
int bufidx;
int len;

preempt_disable_notrace();

bufidx = __this_cpu_inc_return(dynamic_trace_reserve) - 1;
bufidx = __this_cpu_inc_return(ddebug_trace_reserve) - 1;

if (WARN_ON_ONCE(bufidx > DYNAMIC_TRACE_NESTING))
goto out;

/* For the same reasons as in __ftrace_trace_stack(). */
barrier();

buf = this_cpu_ptr(dynamic_trace_bufs.bufs) + bufidx;
buf = this_cpu_ptr(ddebug_trace_bufs.bufs) + bufidx;

len = vscnprintf(buf->buf, sizeof(buf->buf), fmt, args);
trace_console(buf->buf, len);

out:
/* As above. */
barrier();
__this_cpu_dec(dynamic_trace_reserve);
__this_cpu_dec(ddebug_trace_reserve);
preempt_enable_notrace();
}

static void dynamic_printk(unsigned int flags, const char *fmt, ...)
static void ddebug_printk(unsigned int flags, const char *fmt, ...)
{
if (flags & _DPRINTK_FLAGS_TRACE) {
va_list args;
@@ -687,7 +687,7 @@ static void dynamic_printk(unsigned int flags, const char *fmt, ...)
* All callers include the KERN_DEBUG prefix to keep the
* vprintk case simple; strip it out for tracing.
*/
dynamic_trace(fmt + strlen(KERN_DEBUG), args);
ddebug_trace(fmt + strlen(KERN_DEBUG), args);
va_end(args);
}

@@ -700,15 +700,15 @@ static void dynamic_printk(unsigned int flags, const char *fmt, ...)
}
}

static void dynamic_dev_printk(unsigned int flags, const struct device *dev,
static void ddebug_dev_printk(unsigned int flags, const struct device *dev,
const char *fmt, ...)
{

if (flags & _DPRINTK_FLAGS_TRACE) {
va_list args;

va_start(args, fmt);
dynamic_trace(fmt, args);
ddebug_trace(fmt, args);
va_end(args);
}

@@ -735,7 +735,7 @@ void __dynamic_pr_debug(struct _ddebug *descriptor, const char *fmt, ...)
vaf.fmt = fmt;
vaf.va = &args;

dynamic_printk(descriptor->flags, KERN_DEBUG "%s%pV",
ddebug_printk(descriptor->flags, KERN_DEBUG "%s%pV",
dynamic_emit_prefix(descriptor, buf), &vaf);

va_end(args);
@@ -759,12 +759,12 @@ void __dynamic_dev_dbg(struct _ddebug *descriptor,
flags = descriptor->flags;

if (!dev) {
dynamic_printk(flags, KERN_DEBUG "(NULL device *): %pV",
ddebug_printk(flags, KERN_DEBUG "(NULL device *): %pV",
&vaf);
} else {
char buf[PREFIX_SIZE] = "";

dynamic_dev_printk(flags, dev, "%s%s %s: %pV",
ddebug_dev_printk(flags, dev, "%s%s %s: %pV",
dynamic_emit_prefix(descriptor, buf),
dev_driver_string(dev), dev_name(dev),
&vaf);
@@ -795,18 +795,18 @@ void __dynamic_netdev_dbg(struct _ddebug *descriptor,
if (dev && dev->dev.parent) {
char buf[PREFIX_SIZE] = "";

dynamic_dev_printk(flags, dev->dev.parent,
ddebug_dev_printk(flags, dev->dev.parent,
"%s%s %s %s%s: %pV",
dynamic_emit_prefix(descriptor, buf),
dev_driver_string(dev->dev.parent),
dev_name(dev->dev.parent),
netdev_name(dev), netdev_reg_state(dev),
&vaf);
} else if (dev) {
dynamic_printk(flags, KERN_DEBUG "%s%s: %pV",
ddebug_printk(flags, KERN_DEBUG "%s%s: %pV",
netdev_name(dev), netdev_reg_state(dev), &vaf);
} else {
dynamic_printk(flags, KERN_DEBUG "(NULL net_device): %pV",
ddebug_printk(flags, KERN_DEBUG "(NULL net_device): %pV",
&vaf);
}

@@ -834,18 +834,18 @@ void __dynamic_ibdev_dbg(struct _ddebug *descriptor,
if (ibdev && ibdev->dev.parent) {
char buf[PREFIX_SIZE] = "";

dynamic_dev_printk(flags, ibdev->dev.parent,
ddebug_dev_printk(flags, ibdev->dev.parent,
"%s%s %s %s: %pV",
dynamic_emit_prefix(descriptor, buf),
dev_driver_string(ibdev->dev.parent),
dev_name(ibdev->dev.parent),
dev_name(&ibdev->dev),
&vaf);
} else if (ibdev) {
dynamic_printk(flags, KERN_DEBUG "%s%s: %pV",
ddebug_printk(flags, KERN_DEBUG "%s%s: %pV",
dev_name(&ibdev->dev), &vaf);
} else {
dynamic_printk(flags, KERN_DEBUG "(NULL ip_device): %pV",
ddebug_printk(flags, KERN_DEBUG "(NULL ip_device): %pV",
&vaf);
}

0 comments on commit f5b0d82

Please sign in to comment.