CVS commit: src/sys

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Wed Sep 21 18:10:25 UTC 2011

Modified Files:
        src/sys/kern: uipc_syscalls.c
        src/sys/sys: mbuf.h

Log Message:
Put the mbuf type in the ktrace record so that we know how to decode it
in userland.


To generate a diff of this commit:
cvs rdiff -u -r1.146 -r1.147 src/sys/kern/uipc_syscalls.c
cvs rdiff -u -r1.145 -r1.146 src/sys/sys/mbuf.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/kern/uipc_syscalls.c
diff -u src/sys/kern/uipc_syscalls.c:1.146 src/sys/kern/uipc_syscalls.c:1.147
--- src/sys/kern/uipc_syscalls.c:1.146	Wed Jul 27 10:35:34 2011
+++ src/sys/kern/uipc_syscalls.c	Wed Sep 21 14:10:25 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_syscalls.c,v 1.146 2011/07/27 14:35:34 uebayasi Exp $	*/
+/*	$NetBSD: uipc_syscalls.c,v 1.147 2011/09/21 18:10:25 christos Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.146 2011/07/27 14:35:34 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.147 2011/09/21 18:10:25 christos Exp $");
 
 #include "opt_pipe.h"
 
@@ -71,6 +71,7 @@
 #include <sys/proc.h>
 #include <sys/file.h>
 #include <sys/buf.h>
+#define MBUFTYPES
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
@@ -1224,7 +1225,7 @@
 		(void) m_free(m);
 		return (error);
 	}
-	ktrkuser("sockargs", mtod(m, void *), buflen);
+	ktrkuser(mbuftypes[type], mtod(m, void *), buflen);
 	*mp = m;
 	if (type == MT_SONAME) {
 		sa = mtod(m, struct sockaddr *);

Index: src/sys/sys/mbuf.h
diff -u src/sys/sys/mbuf.h:1.145 src/sys/sys/mbuf.h:1.146
--- src/sys/sys/mbuf.h:1.145	Mon Aug  8 15:10:33 2011
+++ src/sys/sys/mbuf.h	Wed Sep 21 14:10:25 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: mbuf.h,v 1.145 2011/08/08 19:10:33 dyoung Exp $	*/
+/*	$NetBSD: mbuf.h,v 1.146 2011/09/21 18:10:25 christos Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1999, 2001, 2007 The NetBSD Foundation, Inc.
@@ -379,6 +379,19 @@
 #define MT_CONTROL	6	/* extra-data protocol message */
 #define MT_OOBDATA	7	/* expedited data  */
 
+#ifdef MBUFTYPES
+static const char *mbuftypes[] = {
+	"mbfree",
+	"mbdata",
+	"mbheader",
+	"mbsoname",
+	"mbsopts",
+	"mbftable",
+	"mbcontrol",
+	"mboobdata",
+};
+#endif
+
 /* flags to m_get/MGET */
 #define	M_DONTWAIT	M_NOWAIT
 #define	M_WAIT		M_WAITOK