Date: Sun, 6 Sep 2009 22:56:07 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r196909 - user/kmacy/releng_7_2_fcs_1/sys/kern Message-ID: <200909062256.n86Mu7nj096678@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Sun Sep 6 22:56:07 2009 New Revision: 196909 URL: http://svn.freebsd.org/changeset/base/196909 Log: simplify KTR reporting Modified: user/kmacy/releng_7_2_fcs_1/sys/kern/uipc_socket.c Modified: user/kmacy/releng_7_2_fcs_1/sys/kern/uipc_socket.c ============================================================================== --- user/kmacy/releng_7_2_fcs_1/sys/kern/uipc_socket.c Sun Sep 6 22:50:22 2009 (r196908) +++ user/kmacy/releng_7_2_fcs_1/sys/kern/uipc_socket.c Sun Sep 6 22:56:07 2009 (r196909) @@ -3221,8 +3221,10 @@ soissending(struct socket *so, struct th bcopy(uap, &ref->sr_uap, sizeof(*uap)); ref->sr_uap.sbytes = NULL; - ref->sr_uap.offset += sbytes; ref->sr_sock_fp->f_sfbytes = 0; + CTR4(KTR_SPARE1, "sock %p off %ld sbytes %ld total_sbytes %ld", + so, ref->sr_uap.offset, sbytes, ref->sr_fp->f_sfbytes); + ref->sr_uap.offset += sbytes; if (uap->nbytes) ref->sr_uap.nbytes -= sbytes; /* @@ -3238,8 +3240,6 @@ soissending(struct socket *so, struct th ref->sr_compat = compat; ref->sr_magic = 0xCAFEBABE; TASK_INIT(&ref->sr_task, 0, sendfile_task_func, ref); - CTR4(KTR_SPARE1, "sock %p off %ld sbytes %ld total_sbytes %ld", - so, ref->sr_uap.offset, sbytes, ref->sr_fp->f_sfbytes); CTR3(KTR_SPARE2, "enqueueing socket %p sock_fp %p s %d", so, ref->sr_sock_fp, uap->s); mtx_lock(&sendfile_bg_lock); @@ -3312,13 +3312,13 @@ sendfile_task_func(void *context, int pe error = kern_sendfile(curthread, &sr->sr_uap, hdr_uio, trl_uio, sr->sr_compat, fp, so, sr->sr_ucred); + CTR4(KTR_SPARE1, "sock %p off %ld sbytes %ld total_sbytes %ld", + so, sr->sr_uap.offset, sbytes, fp->f_sfbytes); atomic_add_long(&fp->f_sfbytes, sbytes); sr->sr_uap.offset += sbytes; if (sr->sr_uap.nbytes) sr->sr_uap.nbytes -= sbytes; - CTR4(KTR_SPARE1, "sock %p off %ld sbytes %ld total_sbytes %ld", - so, sr->sr_uap.offset, sbytes, fp->f_sfbytes); SOCKBUF_LOCK(sb); } #ifdef KTR
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200909062256.n86Mu7nj096678>