From owner-svn-src-head@FreeBSD.ORG Wed Jul 14 17:38:02 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8269C1065678; Wed, 14 Jul 2010 17:38:02 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 71CEF8FC15; Wed, 14 Jul 2010 17:38:02 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6EHc2ur033485; Wed, 14 Jul 2010 17:38:02 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6EHc2Yo033482; Wed, 14 Jul 2010 17:38:02 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201007141738.o6EHc2Yo033482@svn.freebsd.org> From: John Baldwin Date: Wed, 14 Jul 2010 17:38:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210064 - in head/sys: kern sys X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jul 2010 17:38:02 -0000 Author: jhb Date: Wed Jul 14 17:38:01 2010 New Revision: 210064 URL: http://svn.freebsd.org/changeset/base/210064 Log: - Document layout of KTR_STRUCT payload in a comment. - Simplify ktrstruct() calling convention by having ktrstruct() use strlen() rather than requiring the caller to hand-code the length of constant strings. MFC after: 1 month Modified: head/sys/kern/kern_ktrace.c head/sys/sys/ktrace.h Modified: head/sys/kern/kern_ktrace.c ============================================================================== --- head/sys/kern/kern_ktrace.c Wed Jul 14 17:16:25 2010 (r210063) +++ head/sys/kern/kern_ktrace.c Wed Jul 14 17:38:01 2010 (r210064) @@ -596,9 +596,8 @@ ktrcsw(out, user) } void -ktrstruct(name, namelen, data, datalen) +ktrstruct(name, data, datalen) const char *name; - size_t namelen; void *data; size_t datalen; { @@ -608,11 +607,10 @@ ktrstruct(name, namelen, data, datalen) if (!data) datalen = 0; - buflen = namelen + 1 + datalen; + buflen = strlen(name) + 1 + datalen; buf = malloc(buflen, M_KTRACE, M_WAITOK); - bcopy(name, buf, namelen); - buf[namelen] = '\0'; - bcopy(data, buf + namelen + 1, datalen); + strcpy(buf, name); + bcopy(data, buf + strlen(name) + 1, datalen); if ((req = ktr_getrequest(KTR_STRUCT)) == NULL) { free(buf, M_KTRACE); return; Modified: head/sys/sys/ktrace.h ============================================================================== --- head/sys/sys/ktrace.h Wed Jul 14 17:16:25 2010 (r210063) +++ head/sys/sys/ktrace.h Wed Jul 14 17:38:01 2010 (r210064) @@ -154,6 +154,10 @@ struct ktr_csw { * KTR_STRUCT - misc. structs */ #define KTR_STRUCT 8 + /* + * record contains null-terminated struct name followed by + * struct contents + */ struct sockaddr; struct stat; @@ -202,11 +206,11 @@ void ktrsysctl(int *name, u_int namelen) void ktrsysret(int, int, register_t); void ktrprocexit(struct thread *); void ktruserret(struct thread *); -void ktrstruct(const char *, size_t, void *, size_t); +void ktrstruct(const char *, void *, size_t); #define ktrsockaddr(s) \ - ktrstruct("sockaddr", 8, (s), ((struct sockaddr *)(s))->sa_len) + ktrstruct("sockaddr", (s), ((struct sockaddr *)(s))->sa_len) #define ktrstat(s) \ - ktrstruct("stat", 4, (s), sizeof(struct stat)) + ktrstruct("stat", (s), sizeof(struct stat)) #else