[src/trunk]: src/sys/compat/linux/common print proper ktruser names depending...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bfbca5f85bbf
branches:  trunk
changeset: 779816:bfbca5f85bbf
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Jun 20 15:03:18 2012 +0000

description:
print proper ktruser names depending on the emulation.

diffstat:

 sys/compat/linux/common/linux_socket.c     |  10 +++---
 sys/compat/linux/common/linux_socketcall.c |  42 +++++++++++++++--------------
 2 files changed, 27 insertions(+), 25 deletions(-)

diffs (108 lines):

diff -r b99f1c5d4e45 -r bfbca5f85bbf sys/compat/linux/common/linux_socket.c
--- a/sys/compat/linux/common/linux_socket.c    Wed Jun 20 14:19:39 2012 +0000
+++ b/sys/compat/linux/common/linux_socket.c    Wed Jun 20 15:03:18 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_socket.c,v 1.113 2012/03/15 16:17:48 bouyer Exp $        */
+/*     $NetBSD: linux_socket.c,v 1.114 2012/06/20 15:03:18 christos Exp $      */
 
 /*-
  * Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.113 2012/03/15 16:17:48 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.114 2012/06/20 15:03:18 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -619,7 +619,7 @@
                msg.msg_control = ctl_mbuf;
                msg.msg_flags |= MSG_CONTROLMBUF;
 
-               ktrkuser("msgcontrol", mtod(ctl_mbuf, void *),
+               ktrkuser("mbcontrol", mtod(ctl_mbuf, void *),
                    msg.msg_controllen);
        }
 
@@ -1495,7 +1495,7 @@
                goto bad;
        }
 
-       ktrkuser("linux sockaddr", kosa, salen);
+       ktrkuser("linux/sockaddr", kosa, salen);
 
        bdom = linux_to_bsd_domain(kosa->sa_family);
        if (bdom == -1) {
@@ -1557,7 +1557,7 @@
        sa->sa_family = bdom;
        sa->sa_len = salen;
        m->m_len = salen;
-       ktrkuser("new sockaddr", kosa, salen);
+       ktrkuser("mbsoname", kosa, salen);
 
 #ifdef DEBUG_LINUX
        DPRINTF(("family %d, len = %d [ ", sa->sa_family, sa->sa_len));
diff -r b99f1c5d4e45 -r bfbca5f85bbf sys/compat/linux/common/linux_socketcall.c
--- a/sys/compat/linux/common/linux_socketcall.c        Wed Jun 20 14:19:39 2012 +0000
+++ b/sys/compat/linux/common/linux_socketcall.c        Wed Jun 20 15:03:18 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_socketcall.c,v 1.39 2008/07/03 14:07:09 njoly Exp $      */
+/*     $NetBSD: linux_socketcall.c,v 1.40 2012/06/20 15:03:18 christos Exp $   */
 
 /*-
  * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_socketcall.c,v 1.39 2008/07/03 14:07:09 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_socketcall.c,v 1.40 2012/06/20 15:03:18 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -89,24 +89,26 @@
        const char *name;
        int argsize;
 } linux_socketcall[LINUX_MAX_SOCKETCALL+1] = {
-       {"invalid",     -1},                                            /* 0 */
-       {"socket",      sizeof(struct linux_sys_socket_args)},          /* 1 */
-       {"bind",        sizeof(struct linux_sys_bind_args)},            /* 2 */
-       {"connect",     sizeof(struct linux_sys_connect_args)},         /* 3 */
-       {"listen",      sizeof(struct linux_sys_listen_args)},          /* 4 */
-       {"accept",      sizeof(struct linux_sys_accept_args)},          /* 5 */
-       {"getsockname", sizeof(struct linux_sys_getsockname_args)},     /* 6 */
-       {"getpeername", sizeof(struct linux_sys_getpeername_args)},     /* 7 */
-       {"socketpair",  sizeof(struct linux_sys_socketpair_args)},      /* 8 */
-       {"send",        sizeof(struct linux_sys_send_args)},            /* 9 */
-       {"recv",        sizeof(struct linux_sys_recv_args)},            /* 10 */
-       {"sendto",      sizeof(struct linux_sys_sendto_args)},          /* 11 */
-       {"recvfrom",    sizeof(struct linux_sys_recvfrom_args)},        /* 12 */
-       {"shutdown",    sizeof(struct linux_sys_shutdown_args)},        /* 13 */
-       {"setsockopt",  sizeof(struct linux_sys_setsockopt_args)},      /* 14 */
-       {"getsockopt",  sizeof(struct linux_sys_getsockopt_args)},      /* 15 */
-       {"sendmsg",     sizeof(struct linux_sys_sendmsg_args)},         /* 16 */
-       {"recvmsg",     sizeof(struct linux_sys_recvmsg_args)},         /* 17 */
+#define L(a) "linux/" ## a
+       {L("invalid"),  -1},                                            /* 0 */
+       {L("socket"),   sizeof(struct linux_sys_socket_args)},          /* 1 */
+       {L("bind"),     sizeof(struct linux_sys_bind_args)},            /* 2 */
+       {L("connect"),  sizeof(struct linux_sys_connect_args)},         /* 3 */
+       {L("listen"),   sizeof(struct linux_sys_listen_args)},          /* 4 */
+       {L("accept"),   sizeof(struct linux_sys_accept_args)},          /* 5 */
+       {L("getsockname)",sizeof(struct linux_sys_getsockname_args)},   /* 6 */
+       {L("getpeername)",sizeof(struct linux_sys_getpeername_args)},   /* 7 */
+       {L("socketpair"),sizeof(struct linux_sys_socketpair_args)},     /* 8 */
+       {L("send"),     sizeof(struct linux_sys_send_args)},            /* 9 */
+       {L("recv"),     sizeof(struct linux_sys_recv_args)},            /* 10 */
+       {L("sendto"),   sizeof(struct linux_sys_sendto_args)},          /* 11 */
+       {L("recvfrom"), sizeof(struct linux_sys_recvfrom_args)},        /* 12 */
+       {L("shutdown"), sizeof(struct linux_sys_shutdown_args)},        /* 13 */
+       {L("setsockopt"),sizeof(struct linux_sys_setsockopt_args)},     /* 14 */
+       {L("getsockopt"),sizeof(struct linux_sys_getsockopt_args)},     /* 15 */
+       {L("sendmsg"),  sizeof(struct linux_sys_sendmsg_args)},         /* 16 */
+       {L("recvmsg"),  sizeof(struct linux_sys_recvmsg_args)},         /* 17 */
+#undef L
 };
 
 /*