summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2011-08-11 14:36:29 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-08-22 18:23:04 -0700
commit5b2ebce4821c66dd33d15d076ee264b4eb86fea3 (patch)
tree4d5aeb3c6a78a1ddf4cf7a59faca3d67be859180 /lib
parent6c2140ee0ebf91258f93d3019922b5f520a18d88 (diff)
downloadlinux-3.10-5b2ebce4821c66dd33d15d076ee264b4eb86fea3.tar.gz
linux-3.10-5b2ebce4821c66dd33d15d076ee264b4eb86fea3.tar.bz2
linux-3.10-5b2ebce4821c66dd33d15d076ee264b4eb86fea3.zip
dynamic_debug: Remove uses of KERN_CONT in dynamic_emit_prefix
Multiple printks with KERN_CONT can be interleaved by other printks. Reduce the likelihood of that interleaving by consolidating multiple calls to printk. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Jason Baron <jbaron@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'lib')
-rw-r--r--lib/dynamic_debug.c34
1 files changed, 23 insertions, 11 deletions
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index 37217090aac..a3eb6ab074a 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -430,23 +430,35 @@ static int ddebug_exec_query(char *query_string)
static int dynamic_emit_prefix(const struct _ddebug *descriptor)
{
- int res;
+ char tid[sizeof(int) + sizeof(int)/2 + 4];
+ char lineno[sizeof(int) + sizeof(int)/2];
- res = printk(KERN_DEBUG);
if (descriptor->flags & _DPRINTK_FLAGS_INCL_TID) {
if (in_interrupt())
- res += printk(KERN_CONT "<intr> ");
+ snprintf(tid, sizeof(tid), "%s", "<intr> ");
else
- res += printk(KERN_CONT "[%d] ", task_pid_vnr(current));
+ snprintf(tid, sizeof(tid), "[%d] ",
+ task_pid_vnr(current));
+ } else {
+ tid[0] = 0;
}
- if (descriptor->flags & _DPRINTK_FLAGS_INCL_MODNAME)
- res += printk(KERN_CONT "%s:", descriptor->modname);
- if (descriptor->flags & _DPRINTK_FLAGS_INCL_FUNCNAME)
- res += printk(KERN_CONT "%s:", descriptor->function);
- if (descriptor->flags & _DPRINTK_FLAGS_INCL_LINENO)
- res += printk(KERN_CONT "%d ", descriptor->lineno);
- return res;
+ if (descriptor->flags & _DPRINTK_FLAGS_INCL_LINENO)
+ snprintf(lineno, sizeof(lineno), "%d", descriptor->lineno);
+ else
+ lineno[0] = 0;
+
+ return printk(KERN_DEBUG "%s%s%s%s%s%s",
+ tid,
+ (descriptor->flags & _DPRINTK_FLAGS_INCL_MODNAME) ?
+ descriptor->modname : "",
+ (descriptor->flags & _DPRINTK_FLAGS_INCL_MODNAME) ?
+ ":" : "",
+ (descriptor->flags & _DPRINTK_FLAGS_INCL_FUNCNAME) ?
+ descriptor->function : "",
+ (descriptor->flags & _DPRINTK_FLAGS_INCL_FUNCNAME) ?
+ ":" : "",
+ lineno);
}
int __dynamic_pr_debug(struct _ddebug *descriptor, const char *fmt, ...)