From owner-svn-src-user@FreeBSD.ORG Sun Sep 6 20:32:17 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7E10C1065672; Sun, 6 Sep 2009 20:32:17 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6DC8B8FC1A; Sun, 6 Sep 2009 20:32:17 +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 n86KWHlj093863; Sun, 6 Sep 2009 20:32:17 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n86KWHiO093861; Sun, 6 Sep 2009 20:32:17 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200909062032.n86KWHiO093861@svn.freebsd.org> From: Kip Macy Date: Sun, 6 Sep 2009 20:32:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196906 - user/kmacy/releng_7_2_fcs_1/sys/kern X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Sep 2009 20:32:17 -0000 Author: kmacy Date: Sun Sep 6 20:32:16 2009 New Revision: 196906 URL: http://svn.freebsd.org/changeset/base/196906 Log: - bump taskqueue threads to ncpus - try to improve KTR logging 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 19:45:37 2009 (r196905) +++ user/kmacy/releng_7_2_fcs_1/sys/kern/uipc_socket.c Sun Sep 6 20:32:16 2009 (r196906) @@ -3321,13 +3321,20 @@ sendfile_task_func(void *context, int pe so, sr->sr_uap.offset, sbytes, fp->f_sfbytes); SOCKBUF_LOCK(sb); } - +#ifdef KTR + else + CTR2(KTR_SPARE1, "sock %p off %ld - not writeable in task_func", + so, sr->sr_uap.offset); +#endif if (error == EAGAIN && srsendingwakeup(sr) != ENOTCONN) { SOCKBUF_UNLOCK(sb); return; - } else if (error != EAGAIN) + } +#ifdef KTR + if (error && error != EAGAIN && error != EPIPE) CTR1(KTR_SPARE1, "error %d", error); - +#endif + sb->sb_flags &= ~SB_SENDING; sowwakeup_locked(so); done: @@ -3375,6 +3382,8 @@ srsendingwakeup(struct socketref *sr) sb->sb_flags |= SB_SENDING; taskqueue_enqueue(sendfile_tq, &sr->sr_task); } else { + CTR2(KTR_SPARE1, "sock %p off %ld - not writeable in srsendingwakeup", + so, sr->sr_uap.offset); sb->sb_flags |= SB_SENDING; mtx_lock(&sendfile_bg_lock); TAILQ_INSERT_TAIL(sendfile_bg_queue, sr, entry); @@ -3420,7 +3429,7 @@ init_bgsend(void *unused __unused) sendfile_tq = taskqueue_create("sendfile background taskq", M_NOWAIT, taskqueue_thread_enqueue, &sendfile_tq); - taskqueue_start_threads(&sendfile_tq, 4, PI_SOFT, + taskqueue_start_threads(&sendfile_tq, mp_ncpus, PI_SOFT, "sendfile background taskq"); mtx_init(&sendfile_bg_lock, "sendfile bg", NULL, MTX_DEF);