Date: Fri, 2 Sep 2011 08:34:31 +0000 (UTC) From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r225327 - user/adrian/if_ath_tx/sys/dev/ath Message-ID: <201109020834.p828YV26089261@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adrian Date: Fri Sep 2 08:34:31 2011 New Revision: 225327 URL: http://svn.freebsd.org/changeset/base/225327 Log: Migrate the aggregate stats out of sc_stats. 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 user/adrian/if_ath_tx/sys/dev/ath/if_athvar.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 Fri Sep 2 08:19:19 2011 (r225326) +++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_sysctl.c Fri Sep 2 08:34:31 2011 (r225327) @@ -314,19 +314,19 @@ ath_sysctl_txagg(SYSCTL_HANDLER_ARGS) return 0; printf("aggr single packet: %d\n", - sc->sc_stats.tx_aggr.aggr_single_pkt); + sc->sc_aggr_stats.aggr_single_pkt); printf("aggr single packet w/ BAW closed: %d\n", - sc->sc_stats.tx_aggr.aggr_baw_closed_single_pkt); + sc->sc_aggr_stats.aggr_baw_closed_single_pkt); printf("aggr non-baw packet: %d\n", - sc->sc_stats.tx_aggr.aggr_nonbaw_pkt); + sc->sc_aggr_stats.aggr_nonbaw_pkt); printf("aggr aggregate packet: %d\n", - sc->sc_stats.tx_aggr.aggr_aggr_pkt); + sc->sc_aggr_stats.aggr_aggr_pkt); printf("aggr single packet low hwq: %d\n", - sc->sc_stats.tx_aggr.aggr_low_hwq_single_pkt); + sc->sc_aggr_stats.aggr_low_hwq_single_pkt); printf("aggr sched, no work: %d\n", - sc->sc_stats.tx_aggr.aggr_sched_nopkt); + sc->sc_aggr_stats.aggr_sched_nopkt); for (i = 0; i < 64; i++) { - printf("%2d: %10d ", i, sc->sc_stats.tx_aggr.aggr_pkts[i]); + printf("%2d: %10d ", i, sc->sc_aggr_stats.aggr_pkts[i]); if (i % 4 == 3) printf("\n"); } 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 Fri Sep 2 08:19:19 2011 (r225326) +++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c Fri Sep 2 08:34:31 2011 (r225327) @@ -2006,7 +2006,7 @@ ath_tx_xmit_aggr(struct ath_softc *sc, s ath_tx_chaindesclist(sc, bf); /* Statistics */ - sc->sc_stats.tx_aggr.aggr_low_hwq_single_pkt++; + sc->sc_aggr_stats.aggr_low_hwq_single_pkt++; /* Track per-TID hardware queue depth correctly */ tid->hwq_depth++; @@ -3144,7 +3144,7 @@ ath_tx_tid_hw_queue_aggr(struct ath_soft ath_hal_clr11n_aggr(sc->sc_ah, bf->bf_desc); ath_tx_set_ratectrl(sc, ni, bf); - sc->sc_stats.tx_aggr.aggr_nonbaw_pkt++; + sc->sc_aggr_stats.aggr_nonbaw_pkt++; /* Queue the packet; continue */ goto queuepkt; @@ -3184,17 +3184,17 @@ ath_tx_tid_hw_queue_aggr(struct ath_soft ath_hal_clr11n_aggr(sc->sc_ah, bf->bf_desc); ath_tx_set_ratectrl(sc, ni, bf); if (status == ATH_AGGR_BAW_CLOSED) - sc->sc_stats.tx_aggr.aggr_baw_closed_single_pkt++; + sc->sc_aggr_stats.aggr_baw_closed_single_pkt++; else - sc->sc_stats.tx_aggr.aggr_single_pkt++; + sc->sc_aggr_stats.aggr_single_pkt++; } else { DPRINTF(sc, ATH_DEBUG_SW_TX_AGGR, "%s: multi-frame aggregate: %d frames, length %d\n", __func__, bf->bf_state.bfs_nframes, bf->bf_state.bfs_al); bf->bf_state.bfs_aggr = 1; - sc->sc_stats.tx_aggr.aggr_pkts[bf->bf_state.bfs_nframes]++; - sc->sc_stats.tx_aggr.aggr_aggr_pkt++; + sc->sc_aggr_stats.aggr_pkts[bf->bf_state.bfs_nframes]++; + sc->sc_aggr_stats.aggr_aggr_pkt++; /* * Setup the relevant descriptor fields @@ -3323,7 +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++; + sc->sc_aggr_stats.aggr_sched_nopkt++; return; } Modified: user/adrian/if_ath_tx/sys/dev/ath/if_athioctl.h ============================================================================== --- user/adrian/if_ath_tx/sys/dev/ath/if_athioctl.h Fri Sep 2 08:19:19 2011 (r225326) +++ user/adrian/if_ath_tx/sys/dev/ath/if_athioctl.h Fri Sep 2 08:34:31 2011 (r225327) @@ -149,7 +149,6 @@ struct ath_stats { u_int32_t ast_tx_data_underrun; u_int32_t ast_tx_delim_underrun; u_int32_t ast_tx_aggrfail; /* aggregate TX failed in its entirety */ - struct ath_tx_aggr_stats tx_aggr; u_int32_t ast_tx_intr; u_int32_t ast_rx_intr; u_int32_t ast_pad[7]; Modified: user/adrian/if_ath_tx/sys/dev/ath/if_athvar.h ============================================================================== --- user/adrian/if_ath_tx/sys/dev/ath/if_athvar.h Fri Sep 2 08:19:19 2011 (r225326) +++ user/adrian/if_ath_tx/sys/dev/ath/if_athvar.h Fri Sep 2 08:34:31 2011 (r225327) @@ -334,6 +334,7 @@ struct ath_tx99; struct ath_softc { struct ifnet *sc_ifp; /* interface common */ struct ath_stats sc_stats; /* interface statistics */ + struct ath_tx_aggr_stats sc_aggr_stats; int sc_debug; int sc_nvaps; /* # vaps */ int sc_nstavaps; /* # station vaps */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201109020834.p828YV26089261>