From owner-svn-src-all@FreeBSD.ORG Sun Jun 22 21:26:47 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A064E93D; Sun, 22 Jun 2014 21:26:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 72AF52786; Sun, 22 Jun 2014 21:26:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5MLQl1N079738; Sun, 22 Jun 2014 21:26:47 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5MLQlSU079737; Sun, 22 Jun 2014 21:26:47 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201406222126.s5MLQlSU079737@svn.freebsd.org> From: Alexander Motin Date: Sun, 22 Jun 2014 21:26:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r267753 - stable/10/sys/nfs X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jun 2014 21:26:47 -0000 Author: mav Date: Sun Jun 22 21:26:46 2014 New Revision: 267753 URL: http://svnweb.freebsd.org/changeset/base/267753 Log: MFC r267479: Fix/improve fhe_stats sysctl output. Modified: stable/10/sys/nfs/nfs_fha.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/nfs/nfs_fha.c ============================================================================== --- stable/10/sys/nfs/nfs_fha.c Sun Jun 22 21:21:27 2014 (r267752) +++ stable/10/sys/nfs/nfs_fha.c Sun Jun 22 21:26:46 2014 (r267753) @@ -468,14 +468,14 @@ fha_nd_complete(SVCTHREAD *thread, struc int fhe_stats_sysctl(SYSCTL_HANDLER_ARGS, struct fha_params *softc) { - int error, count, i; + int error, i; struct sbuf sb; struct fha_hash_entry *fhe; - bool_t first = TRUE; + bool_t first, hfirst; SVCTHREAD *thread; SVCPOOL *pool; - sbuf_new(&sb, NULL, 4096, SBUF_FIXEDLEN); + sbuf_new(&sb, NULL, 65536, SBUF_FIXEDLEN); pool = NULL; @@ -485,42 +485,44 @@ fhe_stats_sysctl(SYSCTL_HANDLER_ARGS, st } pool = *softc->pool; - count = 0; for (i = 0; i < FHA_HASH_SIZE; i++) if (!LIST_EMPTY(&softc->fha_hash[i].list)) - count++; + break; - if (count == 0) { + if (i == FHA_HASH_SIZE) { sbuf_printf(&sb, "No file handle entries.\n"); goto out; } - for (i = 0; i < FHA_HASH_SIZE; i++) { + hfirst = TRUE; + for (; i < FHA_HASH_SIZE; i++) { mtx_lock(&softc->fha_hash[i].mtx); + if (LIST_EMPTY(&softc->fha_hash[i].list)) { + mtx_unlock(&softc->fha_hash[i].mtx); + continue; + } + sbuf_printf(&sb, "%shash %d: {\n", hfirst ? "" : ", ", i); + first = TRUE; LIST_FOREACH(fhe, &softc->fha_hash[i].list, link) { - sbuf_printf(&sb, "%sfhe %p: {\n", first ? "" : ", ", fhe); + sbuf_printf(&sb, "%sfhe %p: {\n", first ? " " : ", ", fhe); sbuf_printf(&sb, " fh: %ju\n", (uintmax_t) fhe->fh); - sbuf_printf(&sb, " num_rw: %d\n", fhe->num_rw); - sbuf_printf(&sb, " num_exclusive: %d\n", fhe->num_exclusive); + sbuf_printf(&sb, " num_rw/exclusive: %d/%d\n", + fhe->num_rw, fhe->num_exclusive); sbuf_printf(&sb, " num_threads: %d\n", fhe->num_threads); LIST_FOREACH(thread, &fhe->threads, st_alink) { - sbuf_printf(&sb, " thread %p offset %ju " - "(count %d)\n", thread, + sbuf_printf(&sb, " thread %p offset %ju " + "reqs %d\n", thread, thread->st_p3, thread->st_p2); } - sbuf_printf(&sb, "}"); + sbuf_printf(&sb, " }"); first = FALSE; - - /* Limit the output. */ - if (++count > 128) { - sbuf_printf(&sb, "..."); - break; - } } + sbuf_printf(&sb, "\n}"); mtx_unlock(&softc->fha_hash[i].mtx); + hfirst = FALSE; } out: