From owner-svn-src-user@FreeBSD.ORG Wed Aug 31 09:31:50 2011 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 F01991065672; Wed, 31 Aug 2011 09:31:50 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C71838FC18; Wed, 31 Aug 2011 09:31:50 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7V9Vo9Z092151; Wed, 31 Aug 2011 09:31:50 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7V9VoDR092147; Wed, 31 Aug 2011 09:31:50 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201108310931.p7V9VoDR092147@svn.freebsd.org> From: Adrian Chadd Date: Wed, 31 Aug 2011 09:31:50 +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: r225291 - user/adrian/if_ath_tx/sys/dev/ath 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: Wed, 31 Aug 2011 09:31:51 -0000 Author: adrian Date: Wed Aug 31 09:31:50 2011 New Revision: 225291 URL: http://svn.freebsd.org/changeset/base/225291 Log: Add another statistic - track how many times the scheduler is called whilst the hardware queue is too deep. Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath_sysctl.c user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c user/adrian/if_ath_tx/sys/dev/ath/if_athioctl.h Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath_sysctl.c ============================================================================== --- user/adrian/if_ath_tx/sys/dev/ath/if_ath_sysctl.c Wed Aug 31 09:29:46 2011 (r225290) +++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_sysctl.c Wed Aug 31 09:31:50 2011 (r225291) @@ -323,6 +323,8 @@ ath_sysctl_txagg(SYSCTL_HANDLER_ARGS) sc->sc_stats.tx_aggr.aggr_aggr_pkt); printf("aggr single packet low hwq: %d\n", sc->sc_stats.tx_aggr.aggr_low_hwq_single_pkt); + printf("aggr sched, no work: %d\n", + sc->sc_stats.tx_aggr.aggr_sched_nopkt); for (i = 0; i < 64; i++) { printf("%2d: %10d ", i, sc->sc_stats.tx_aggr.aggr_pkts[i]); if (i % 4 == 3) Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c ============================================================================== --- user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c Wed Aug 31 09:29:46 2011 (r225290) +++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c Wed Aug 31 09:31:50 2011 (r225291) @@ -3323,6 +3323,7 @@ ath_txq_sched(struct ath_softc *sc, stru * some packets in the aggregation queue. */ if (txq->axq_aggr_depth >= sc->sc_hwq_limit) { + sc->sc_stats.tx_aggr.aggr_sched_nopkt++; return; } @@ -3335,9 +3336,6 @@ ath_txq_sched(struct ath_softc *sc, stru /* * Suspend paused queues here; they'll be resumed * once the addba completes or times out. - * - * Since this touches tid->paused, it should lock - * the TID lock before checking. */ DPRINTF(sc, ATH_DEBUG_SW_TX, "%s: tid=%d, paused=%d\n", __func__, tid->tid, tid->paused); Modified: user/adrian/if_ath_tx/sys/dev/ath/if_athioctl.h ============================================================================== --- user/adrian/if_ath_tx/sys/dev/ath/if_athioctl.h Wed Aug 31 09:29:46 2011 (r225290) +++ user/adrian/if_ath_tx/sys/dev/ath/if_athioctl.h Wed Aug 31 09:31:50 2011 (r225291) @@ -42,6 +42,7 @@ struct ath_tx_aggr_stats { u_int32_t aggr_aggr_pkt; u_int32_t aggr_baw_closed_single_pkt; u_int32_t aggr_low_hwq_single_pkt; + u_int32_t aggr_sched_nopkt; }; struct ath_stats {