From owner-svn-src-all@FreeBSD.ORG Thu Feb 5 21:09:47 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 02C88106564A; Thu, 5 Feb 2009 21:09:47 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CBA9D8FC1D; Thu, 5 Feb 2009 21:09:46 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n15L9k2O039094; Thu, 5 Feb 2009 21:09:46 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n15L9klk039093; Thu, 5 Feb 2009 21:09:46 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200902052109.n15L9klk039093@svn.freebsd.org> From: Sam Leffler Date: Thu, 5 Feb 2009 21:09:46 +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: r188196 - head/tools/tools/ath/athstats X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Thu, 05 Feb 2009 21:09:47 -0000 Author: sam Date: Thu Feb 5 21:09:46 2009 New Revision: 188196 URL: http://svn.freebsd.org/changeset/base/188196 Log: add new stats and missing tx_raw stat Modified: head/tools/tools/ath/athstats/athstats.c Modified: head/tools/tools/ath/athstats/athstats.c ============================================================================== --- head/tools/tools/ath/athstats/athstats.c Thu Feb 5 21:02:40 2009 (r188195) +++ head/tools/tools/ath/athstats/athstats.c Thu Feb 5 21:09:46 2009 (r188196) @@ -217,7 +217,9 @@ static const struct fmt athstats[] = { { 5, "tdmat", "tdmat", "TDMA slot update set TSF" }, #define S_TDMA_TSFADJ AFTER(S_TDMA_TSF) { 8, "tdmadj", "tdmadj", "TDMA slot adjust (usecs, smoothed)" }, -#define S_RATE_CALLS AFTER(S_TDMA_TSFADJ) +#define S_TDMA_ACK AFTER(S_TDMA_TSFADJ) + { 5, "tdmack", "tdmack", "TDMA tx failed 'cuz ACK required" }, +#define S_RATE_CALLS AFTER(S_TDMA_ACK) #else #define S_RATE_CALLS AFTER(S_PER_RFGAIN) #endif @@ -236,7 +238,9 @@ static const struct fmt athstats[] = { { 5, "bmissphantom", "bmissphantom", "phantom beacon misses" }, #define S_TX_RAW AFTER(S_BMISS_PHANTOM) { 5, "txraw", "txraw", "tx frames through raw api" }, -#define S_RX_TOOBIG AFTER(S_TX_RAW) +#define S_TX_RAW_FAIL AFTER(S_TX_RAW) + { 5, "txrawfail", "txrawfail", "raw tx failed 'cuz interface/hw down" }, +#define S_RX_TOOBIG AFTER(S_TX_RAW_FAIL) { 5, "rx2big", "rx2big", "rx failed 'cuz frame too large" }, #ifndef __linux__ #define S_CABQ_XMIT AFTER(S_RX_TOOBIG) @@ -557,6 +561,8 @@ ath_get_curstat(struct statfoo *sf, int case S_TX_SHORTPRE: STAT(tx_shortpre); case S_TX_ALTRATE: STAT(tx_altrate); case S_TX_PROTECT: STAT(tx_protect); + case S_TX_RAW: STAT(tx_raw); + case S_TX_RAW_FAIL: STAT(tx_raw_fail); case S_RX_NOMBUF: STAT(rx_nombuf); #ifdef S_RX_BUSDMA case S_RX_BUSDMA: STAT(rx_busdma); @@ -609,6 +615,7 @@ ath_get_curstat(struct statfoo *sf, int snprintf(b, bs, "-%d/+%d", wf->cur.ath.ast_tdma_tsfadjm, wf->cur.ath.ast_tdma_tsfadjp); return 1; + case S_TDMA_ACK: STAT(tdma_ack); #endif case S_RATE_CALLS: STAT(rate_calls); case S_RATE_RAISE: STAT(rate_raise); @@ -771,6 +778,8 @@ ath_get_totstat(struct statfoo *sf, int case S_TX_SHORTPRE: STAT(tx_shortpre); case S_TX_ALTRATE: STAT(tx_altrate); case S_TX_PROTECT: STAT(tx_protect); + case S_TX_RAW: STAT(tx_raw); + case S_TX_RAW_FAIL: STAT(tx_raw_fail); case S_RX_NOMBUF: STAT(rx_nombuf); #ifdef S_RX_BUSDMA case S_RX_BUSDMA: STAT(rx_busdma); @@ -824,6 +833,7 @@ ath_get_totstat(struct statfoo *sf, int wf->total.ath.ast_tdma_tsfadjm, wf->total.ath.ast_tdma_tsfadjp); return 1; + case S_TDMA_ACK: STAT(tdma_ack); #endif case S_RATE_CALLS: STAT(rate_calls); case S_RATE_RAISE: STAT(rate_raise);