From owner-svn-src-projects@FreeBSD.ORG Fri Feb 13 05:51:36 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 74A89106564A; Fri, 13 Feb 2009 05:51:36 +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 6295E8FC12; Fri, 13 Feb 2009 05:51:36 +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 n1D5pasP078128; Fri, 13 Feb 2009 05:51:36 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1D5paPp078125; Fri, 13 Feb 2009 05:51:36 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200902130551.n1D5paPp078125@svn.freebsd.org> From: Sam Leffler Date: Fri, 13 Feb 2009 05:51:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r188565 - in projects/vap7/tools/tools/ath: . athstats X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Feb 2009 05:51:36 -0000 Author: sam Date: Fri Feb 13 05:51:36 2009 New Revision: 188565 URL: http://svn.freebsd.org/changeset/base/188565 Log: merge r188558: backout r188327, it broke summary printing Modified: projects/vap7/tools/tools/ath/ (props changed) projects/vap7/tools/tools/ath/athstats/Makefile projects/vap7/tools/tools/ath/athstats/athstats.c projects/vap7/tools/tools/ath/athstats/statfoo.c Modified: projects/vap7/tools/tools/ath/athstats/Makefile ============================================================================== --- projects/vap7/tools/tools/ath/athstats/Makefile Fri Feb 13 05:50:18 2009 (r188564) +++ projects/vap7/tools/tools/ath/athstats/Makefile Fri Feb 13 05:51:36 2009 (r188565) @@ -4,9 +4,6 @@ PROG= athstats SRCS= main.c statfoo.c athstats.c -DPADD= ${LIBUTIL} -LDADD= -lutil - .include SRCDIR= ${.CURDIR}/../../../.. Modified: projects/vap7/tools/tools/ath/athstats/athstats.c ============================================================================== --- projects/vap7/tools/tools/ath/athstats/athstats.c Fri Feb 13 05:50:18 2009 (r188564) +++ projects/vap7/tools/tools/ath/athstats/athstats.c Fri Feb 13 05:51:36 2009 (r188565) @@ -46,7 +46,6 @@ #include #include #include -#include #include "ah.h" #include "ah_desc.h" @@ -68,15 +67,15 @@ static const struct fmt athstats[] = { #define S_INPUT 0 - { 7, "input", "input", "data frames received" }, + { 8, "input", "input", "data frames received" }, #define S_OUTPUT AFTER(S_INPUT) - { 7, "output", "output", "data frames transmit" }, + { 8, "output", "output", "data frames transmit" }, #define S_TX_ALTRATE AFTER(S_OUTPUT) { 7, "altrate", "altrate", "tx frames with an alternate rate" }, #define S_TX_SHORTRETRY AFTER(S_TX_ALTRATE) - { 6, "short", "short", "short on-chip tx retries" }, + { 7, "short", "short", "short on-chip tx retries" }, #define S_TX_LONGRETRY AFTER(S_TX_SHORTRETRY) - { 6, "long", "long", "long on-chip tx retries" }, + { 7, "long", "long", "long on-chip tx retries" }, #define S_TX_XRETRIES AFTER(S_TX_LONGRETRY) { 6, "xretry", "xretry", "tx failed 'cuz too many retries" }, #define S_MIB AFTER(S_TX_XRETRIES) @@ -202,7 +201,7 @@ static const struct fmt athstats[] = { #define S_BE_NOMBUF AFTER(S_RX_PHY_CCK_RESTART) { 4, "benombuf", "benombuf", "beacon setup failed 'cuz no mbuf" }, #define S_BE_XMIT AFTER(S_BE_NOMBUF) - { 6, "bexmit", "bexmit", "beacons transmitted" }, + { 7, "bexmit", "bexmit", "beacons transmitted" }, #define S_PER_CAL AFTER(S_BE_XMIT) { 4, "pcal", "pcal", "periodic calibrations" }, #define S_PER_CALFAIL AFTER(S_PER_CAL) @@ -211,13 +210,13 @@ static const struct fmt athstats[] = { { 4, "prfga", "prfga", "rfgain value change" }, #if ATH_SUPPORT_TDMA #define S_TDMA_UPDATE AFTER(S_PER_RFGAIN) - { 6, "tdmau", "tdmau", "TDMA slot timing updates" }, + { 5, "tdmau", "tdmau", "TDMA slot timing updates" }, #define S_TDMA_TIMERS AFTER(S_TDMA_UPDATE) - { 6, "tdmab", "tdmab", "TDMA slot update set beacon timers" }, + { 5, "tdmab", "tdmab", "TDMA slot update set beacon timers" }, #define S_TDMA_TSF AFTER(S_TDMA_TIMERS) - { 6, "tdmat", "tdmat", "TDMA slot update set TSF" }, + { 5, "tdmat", "tdmat", "TDMA slot update set TSF" }, #define S_TDMA_TSFADJ AFTER(S_TDMA_TSF) - { 6, "tdmadj", "tdmadj", "TDMA slot adjust (usecs, smoothed)" }, + { 8, "tdmadj", "tdmadj", "TDMA slot adjust (usecs, smoothed)" }, #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) @@ -307,9 +306,9 @@ static const struct fmt athstats[] = { #define S_ANI_STEPDOWN AFTER(S_ANI_STEPUP) { 5, "step-","STEP-", "ANI decreased first step level" }, #define S_ANI_OFDMERRS AFTER(S_ANI_STEPDOWN) - { 7, "ofdm", "OFDM", "cumulative OFDM phy error count" }, + { 8, "ofdm", "OFDM", "cumulative OFDM phy error count" }, #define S_ANI_CCKERRS AFTER(S_ANI_OFDMERRS) - { 7, "cck", "CCK", "cumulative CCK phy error count" }, + { 8, "cck", "CCK", "cumulative CCK phy error count" }, #define S_ANI_RESET AFTER(S_ANI_CCKERRS) { 5, "reset","RESET", "ANI parameters zero'd for non-STA operation" }, #define S_ANI_LZERO AFTER(S_ANI_RESET) @@ -317,15 +316,15 @@ static const struct fmt athstats[] = { #define S_ANI_LNEG AFTER(S_ANI_LZERO) { 5, "lneg", "LNEG", "ANI calculated listen time < 0" }, #define S_MIB_ACKBAD AFTER(S_ANI_LNEG) - { 7, "ackbad","ACKBAD", "missing ACK's" }, + { 5, "ackbad","ACKBAD", "missing ACK's" }, #define S_MIB_RTSBAD AFTER(S_MIB_ACKBAD) - { 7, "rtsbad","RTSBAD", "RTS without CTS" }, + { 5, "rtsbad","RTSBAD", "RTS without CTS" }, #define S_MIB_RTSGOOD AFTER(S_MIB_RTSBAD) - { 7, "rtsgood","RTSGOOD", "successful RTS" }, + { 5, "rtsgood","RTSGOOD", "successful RTS" }, #define S_MIB_FCSBAD AFTER(S_MIB_RTSGOOD) - { 7, "fcsbad","FCSBAD", "bad FCS" }, + { 5, "fcsbad","FCSBAD", "bad FCS" }, #define S_MIB_BEACONS AFTER(S_MIB_FCSBAD) - { 7, "beacons","beacons", "beacons received" }, + { 5, "beacons","beacons", "beacons received" }, #define S_NODE_AVGBRSSI AFTER(S_MIB_BEACONS) { 3, "avgbrssi","BSI", "average rssi (beacons only)" }, #define S_NODE_AVGRSSI AFTER(S_NODE_AVGBRSSI) @@ -336,37 +335,37 @@ static const struct fmt athstats[] = { #else #define S_ANT_TX0 AFTER(S_ANT_TXSWITCH) #endif /* ATH_SUPPORT_ANI */ - { 7, "tx0", "ant0(tx)", "frames tx on antenna 0" }, + { 8, "tx0", "ant0(tx)", "frames tx on antenna 0" }, #define S_ANT_TX1 AFTER(S_ANT_TX0) - { 7, "tx1", "ant1(tx)", "frames tx on antenna 1" }, + { 8, "tx1", "ant1(tx)", "frames tx on antenna 1" }, #define S_ANT_TX2 AFTER(S_ANT_TX1) - { 7, "tx2", "ant2(tx)", "frames tx on antenna 2" }, + { 8, "tx2", "ant2(tx)", "frames tx on antenna 2" }, #define S_ANT_TX3 AFTER(S_ANT_TX2) - { 7, "tx3", "ant3(tx)", "frames tx on antenna 3" }, + { 8, "tx3", "ant3(tx)", "frames tx on antenna 3" }, #define S_ANT_TX4 AFTER(S_ANT_TX3) - { 7, "tx4", "ant4(tx)", "frames tx on antenna 4" }, + { 8, "tx4", "ant4(tx)", "frames tx on antenna 4" }, #define S_ANT_TX5 AFTER(S_ANT_TX4) - { 7, "tx5", "ant5(tx)", "frames tx on antenna 5" }, + { 8, "tx5", "ant5(tx)", "frames tx on antenna 5" }, #define S_ANT_TX6 AFTER(S_ANT_TX5) - { 7, "tx6", "ant6(tx)", "frames tx on antenna 6" }, + { 8, "tx6", "ant6(tx)", "frames tx on antenna 6" }, #define S_ANT_TX7 AFTER(S_ANT_TX6) - { 7, "tx7", "ant7(tx)", "frames tx on antenna 7" }, + { 8, "tx7", "ant7(tx)", "frames tx on antenna 7" }, #define S_ANT_RX0 AFTER(S_ANT_TX7) - { 7, "rx0", "ant0(rx)", "frames rx on antenna 0" }, + { 8, "rx0", "ant0(rx)", "frames rx on antenna 0" }, #define S_ANT_RX1 AFTER(S_ANT_RX0) - { 7, "rx1", "ant1(rx)", "frames rx on antenna 1" }, + { 8, "rx1", "ant1(rx)", "frames rx on antenna 1" }, #define S_ANT_RX2 AFTER(S_ANT_RX1) - { 7, "rx2", "ant2(rx)", "frames rx on antenna 2" }, + { 8, "rx2", "ant2(rx)", "frames rx on antenna 2" }, #define S_ANT_RX3 AFTER(S_ANT_RX2) - { 7, "rx3", "ant3(rx)", "frames rx on antenna 3" }, + { 8, "rx3", "ant3(rx)", "frames rx on antenna 3" }, #define S_ANT_RX4 AFTER(S_ANT_RX3) - { 7, "rx4", "ant4(rx)", "frames rx on antenna 4" }, + { 8, "rx4", "ant4(rx)", "frames rx on antenna 4" }, #define S_ANT_RX5 AFTER(S_ANT_RX4) - { 7, "rx5", "ant5(rx)", "frames rx on antenna 5" }, + { 8, "rx5", "ant5(rx)", "frames rx on antenna 5" }, #define S_ANT_RX6 AFTER(S_ANT_RX5) - { 7, "rx6", "ant6(rx)", "frames rx on antenna 6" }, + { 8, "rx6", "ant6(rx)", "frames rx on antenna 6" }, #define S_ANT_RX7 AFTER(S_ANT_RX6) - { 7, "rx7", "ant7(rx)", "frames rx on antenna 7" }, + { 8, "rx7", "ant7(rx)", "frames rx on antenna 7" }, #define S_TX_SIGNAL AFTER(S_ANT_RX7) { 4, "asignal", "asig", "signal of last ack (dBm)" }, #define S_RX_SIGNAL AFTER(S_TX_SIGNAL) @@ -711,38 +710,32 @@ ath_get_curstat(struct statfoo *sf, int #undef STAT } -int -hnprintf(char *b, size_t bs, const char *fmt, int64_t v) -{ - humanize_number(b, bs, v, "", HN_AUTOSCALE, HN_NOSPACE); -} - static int ath_get_totstat(struct statfoo *sf, int s, char b[], size_t bs) { struct athstatfoo_p *wf = (struct athstatfoo_p *) sf; #define STAT(x) \ - hnprintf(b, bs, "%u", (int64_t) wf->total.ath.ast_##x); return 1 + snprintf(b, bs, "%u", wf->total.ath.ast_##x); return 1 #define PHY(x) \ - hnprintf(b, bs, "%u", (int64_t) wf->total.ath.ast_rx_phy[x]); return 1 + snprintf(b, bs, "%u", wf->total.ath.ast_rx_phy[x]); return 1 #define ANI(x) \ - hnprintf(b, bs, "%u", (int64_t) wf->total.ani_state.x); return 1 + snprintf(b, bs, "%u", wf->total.ani_state.x); return 1 #define ANISTAT(x) \ - hnprintf(b, bs, "%u", (int64_t) wf->total.ani_stats.ast_ani_##x); return 1 + snprintf(b, bs, "%u", wf->total.ani_stats.ast_ani_##x); return 1 #define MIBSTAT(x) \ - hnprintf(b, bs, "%u", (int64_t) wf->total.ani_stats.ast_mibstats.x); return 1 + snprintf(b, bs, "%u", wf->total.ani_stats.ast_mibstats.x); return 1 #define TXANT(x) \ - hnprintf(b, bs, "%u", (int64_t) wf->total.ath.ast_ant_tx[x]); return 1 + snprintf(b, bs, "%u", wf->total.ath.ast_ant_tx[x]); return 1 #define RXANT(x) \ - hnprintf(b, bs, "%u", (int64_t) wf->total.ath.ast_ant_rx[x]); return 1 + snprintf(b, bs, "%u", wf->total.ath.ast_ant_rx[x]); return 1 switch (s) { case S_INPUT: - hnprintf(b, bs, "%lu", + snprintf(b, bs, "%lu", wf->total.ath.ast_rx_packets - wf->total.ath.ast_rx_mgt); return 1; case S_OUTPUT: - hnprintf(b, bs, "%lu", wf->total.ath.ast_tx_packets); + snprintf(b, bs, "%lu", wf->total.ath.ast_tx_packets); return 1; case S_RATE: snprintrate(b, bs, wf->total.ath.ast_tx_rate); Modified: projects/vap7/tools/tools/ath/athstats/statfoo.c ============================================================================== --- projects/vap7/tools/tools/ath/athstats/statfoo.c Fri Feb 13 05:50:18 2009 (r188564) +++ projects/vap7/tools/tools/ath/athstats/statfoo.c Fri Feb 13 05:51:36 2009 (r188565) @@ -109,7 +109,7 @@ statfoo_print_current(struct statfoo *sf for (cp = sf->fmts; *cp != '\0'; cp++) { if (*cp & 0x80) { const struct fmt *f = &sf->stats[*cp &~ 0x80]; - if (sf->get_curstat(sf, *cp &~ 0x80, buf, f->width)) + if (sf->get_curstat(sf, *cp &~ 0x80, buf, sizeof(buf))) fprintf(fd, "%*s", f->width, buf); } else putc(*cp, fd); @@ -126,7 +126,7 @@ statfoo_print_total(struct statfoo *sf, for (cp = sf->fmts; *cp != '\0'; cp++) { if (*cp & 0x80) { const struct fmt *f = &sf->stats[*cp &~ 0x80]; - if (sf->get_totstat(sf, *cp &~ 0x80, buf, f->width)) + if (sf->get_totstat(sf, *cp &~ 0x80, buf, sizeof(buf))) fprintf(fd, "%*s", f->width, buf); } else putc(*cp, fd);