Date: Sat, 28 Apr 2012 08:17:19 +0000 (UTC) From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r234751 - in head/tools/tools/ath: . athsurvey Message-ID: <201204280817.q3S8HJS0049708@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adrian Date: Sat Apr 28 08:17:19 2012 New Revision: 234751 URL: http://svn.freebsd.org/changeset/base/234751 Log: Add a tool to print out min, average and max channel survey information from the current channel. There seem to be some occasional issues with the extension channel counters reporting more than 100% of use. I'll investigate that soon. Added: head/tools/tools/ath/athsurvey/ head/tools/tools/ath/athsurvey/Makefile (contents, props changed) head/tools/tools/ath/athsurvey/athsurvey.c (contents, props changed) Modified: head/tools/tools/ath/Makefile Modified: head/tools/tools/ath/Makefile ============================================================================== --- head/tools/tools/ath/Makefile Sat Apr 28 08:15:40 2012 (r234750) +++ head/tools/tools/ath/Makefile Sat Apr 28 08:17:19 2012 (r234751) @@ -3,5 +3,6 @@ SUBDIR= arcode athdebug athdecode athkey athpoke athprom athrd athregs SUBDIR+= athstats ath_prom_read athradar SUBDIR+= ath_ee_v14_print ath_ee_v4k_print ath_ee_9287_print +SUBDIR+= athsurvey .include <bsd.subdir.mk> Added: head/tools/tools/ath/athsurvey/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/tools/ath/athsurvey/Makefile Sat Apr 28 08:17:19 2012 (r234751) @@ -0,0 +1,16 @@ +# $FreeBSD$ + +PROG= athsurvey + +.include <../Makefile.inc> + +SRCS= athsurvey.c +SRCS+= opt_ah.h +CLEANFILES+= opt_ah.h + +opt_ah.h: + echo "#define AH_DEBUG 1" > opt_ah.h + echo "#define AH_DEBUG_COUNTRY 1" >> opt_ah.h + echo "#define AH_SUPPORT_AR5416 1" >> opt_ah.h + +.include <bsd.prog.mk> Added: head/tools/tools/ath/athsurvey/athsurvey.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/tools/ath/athsurvey/athsurvey.c Sat Apr 28 08:17:19 2012 (r234751) @@ -0,0 +1,216 @@ +/*- + * Copyright (c) 2012 Adrian Chadd + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer, + * without modification. + * 2. Redistributions in binary form must reproduce at minimum a disclaimer + * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any + * redistribution must be conditioned upon including a substantially + * similar Disclaimer requirement for further binary redistribution. + * + * NO WARRANTY + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTIBILITY + * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER + * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGES. + * + * $FreeBSD$ + */ +#include "diag.h" + +#include "ah.h" +#include "ah_internal.h" + +#include <getopt.h> +#include <errno.h> +#include <err.h> +#include <stdlib.h> +#include <string.h> +#include <ctype.h> +#include <unistd.h> + +const char *progname; + +static void +usage() +{ + fprintf(stderr, "usage: %s [-i ifname]\n", progname); + exit(-1); +} + +static int +get_survey_stats(int s, const char *ifname, HAL_CHANNEL_SURVEY *hs) +{ + uint16_t eedata; + struct ath_diag atd; + + memset(&atd, '\0', sizeof(atd)); + + atd.ad_id = HAL_DIAG_CHANSURVEY | ATH_DIAG_OUT; + atd.ad_in_size = 0; + atd.ad_in_data = NULL; + atd.ad_out_size = sizeof(HAL_CHANNEL_SURVEY); + atd.ad_out_data = (caddr_t) hs; + strncpy(atd.ad_name, ifname, sizeof(atd.ad_name)); + + if (ioctl(s, SIOCGATHDIAG, &atd) < 0) { + err(1, atd.ad_name); + return (0); + } + return (1); +} + +static void +process_survey_stats(HAL_CHANNEL_SURVEY *hs) +{ + int i; + float tx = 0.0, rx = 0.0, cc = 0.0, cext = 0.0; + float max_tx = 0.0, max_rx = 0.0, max_cc = 0.0, max_cext = 0.0; + uint64_t avg_tx = 0, avg_rx = 0, avg_cc = 0, avg_cext = 0; + float min_tx = 100.0, min_rx = 100.0, min_cc = 100.0, min_cext = 100.0; + int n = 0; + int cycle_count = 0, max_cycle_count = 0; + + /* Calculate a percentage channel busy */ + for (i = 0; i < CHANNEL_SURVEY_SAMPLE_COUNT; i++) { + /* + * Skip samples with no cycle count + */ + if (hs->samples[i].cycle_count == 0) + continue; + n++; + + /* + * Grab cycle count, calculate maximum just for curiousity + */ + cycle_count = hs->samples[i].cycle_count; + if (cycle_count > max_cycle_count) + max_cycle_count = cycle_count; + + /* + * Calculate percentage + */ + tx = (float) hs->samples[i].tx_busy * 100.0 / + hs->samples[i].cycle_count; + rx = (float) hs->samples[i].rx_busy * 100.0 / + hs->samples[i].cycle_count; + cc = (float) hs->samples[i].chan_busy * 100.0 / + hs->samples[i].cycle_count; + cext = (float) hs->samples[i].ext_chan_busy * 100.0 / + hs->samples[i].cycle_count; + + /* + * Update rolling average + * XXX to preserve some accuracy, keep two decimal points + * using "fixed" point math. + */ + avg_tx += (uint64_t) hs->samples[i].tx_busy * 10000 / + hs->samples[i].cycle_count; + avg_rx += (uint64_t) hs->samples[i].rx_busy * 10000 / + hs->samples[i].cycle_count; + avg_cc += (uint64_t) hs->samples[i].chan_busy * 10000 / + hs->samples[i].cycle_count; + avg_cext += (uint64_t) hs->samples[i].ext_chan_busy * 10000 / + hs->samples[i].cycle_count; + + /* + * Update maximum values + */ + if (tx > max_tx) + max_tx = tx; + if (rx > max_rx) + max_rx = rx; + if (cc > max_cc) + max_cc = cc; + if (cext > max_cext) + max_cext = cext; + + /* + * Update minimum values + */ + if (tx < min_tx) + min_tx = tx; + if (rx < min_rx) + min_rx = rx; + if (cc < min_cc) + min_cc = cc; + if (cext < min_cext) + min_cext = cext; + } + + printf("(%4.1f %4.1f %4.1f %4.1f) ", + min_tx, min_rx, min_cc, min_cext); + printf("(%4.1f %4.1f %4.1f %4.1f) ", + n == 0 ? 0.0 : (float) (avg_tx / n) / 100.0, + n == 0 ? 0.0 : (float) (avg_rx / n) / 100.0, + n == 0 ? 0.0 : (float) (avg_cc / n) / 100.0, + n == 0 ? 0.0 : (float) (avg_cext / n) / 100.0); + printf("(%4.1f %4.1f %4.1f %4.1f)\n", + max_tx, max_rx, max_cc, max_cext); +} + +int +main(int argc, char *argv[]) +{ + FILE *fd = NULL; + const char *ifname; + int c, s; + int l = 0; + + s = socket(AF_INET, SOCK_DGRAM, 0); + if (s < 0) + err(1, "socket"); + ifname = getenv("ATH"); + if (!ifname) + ifname = ATH_DEFAULT; + + progname = argv[0]; + while ((c = getopt(argc, argv, "i:")) != -1) + switch (c) { + case 'i': + ifname = optarg; + break; + default: + usage(); + /*NOTREACHED*/ + } + argc -= optind; + argv += optind; + + /* Now, loop over and fetch some statistics .. */ + while (1) { + HAL_CHANNEL_SURVEY hs; + memset(&hs, '\0', sizeof(hs)); + if (get_survey_stats(s, ifname, &hs) == 0) + break; + /* XXX screen height! */ + if (l % 23 == 0) { + printf(" " + "min " + "avg " + "max\n"); + printf(" tx%% rx%% cc%% ec%% "); + printf(" tx%% rx%% cc%% ec%% "); + printf(" tx%% rx%% cc%% ec%%\n"); + } + process_survey_stats(&hs); + sleep(1); + l++; + } + + return (0); +} + +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204280817.q3S8HJS0049708>