NetBSD/usr.sbin/altq/altqstat/qdisc_fifoq.c
peter ba31dc0ca8 - Show statistics immediately, not after a 5 second delay.
- For cbq, cdnr, hfsc and priq: if previous stats aren't available yet
  then don't show the packet/byte rate.
- Place the count check before the delay and after the stats printing.

This fixes PR #32847

ok tron@
2006-10-28 11:43:02 +00:00

94 lines
3.0 KiB
C

/* $NetBSD: qdisc_fifoq.c,v 1.5 2006/10/28 11:43:02 peter Exp $ */
/* $KAME: qdisc_fifoq.c,v 1.6 2002/11/08 06:36:18 kjc Exp $ */
/*
* Copyright (C) 1999-2000
* Sony Computer Science Laboratories, Inc. 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.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY SONY CSL AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL SONY CSL OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, 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 DAMAGE.
*/
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/time.h>
#include <sys/socket.h>
#include <net/if.h>
#include <netinet/in.h>
#include <altq/altq.h>
#include <altq/altq_fifoq.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <signal.h>
#include <errno.h>
#include <err.h>
#include "altqstat.h"
void
fifoq_stat_loop(int fd, const char *ifname, int count, int interval)
{
struct fifoq_getstats get_stats;
struct timeval cur_time, last_time;
u_int64_t last_bytes;
double sec;
int cnt = count;
sigset_t omask;
strlcpy(get_stats.iface.fifoq_ifname, ifname,
sizeof(get_stats.iface.fifoq_ifname));
gettimeofday(&last_time, NULL);
last_time.tv_sec -= interval;
last_bytes = 0;
for (;;) {
if (ioctl(fd, FIFOQ_GETSTATS, &get_stats) < 0)
err(1, "ioctl FIFOQ_GETSTATS");
gettimeofday(&cur_time, NULL);
sec = calc_interval(&cur_time, &last_time);
printf(" q_len:%d q_limit:%d period:%u\n",
get_stats.q_len, get_stats.q_limit, get_stats.period);
printf(" xmit:%llu pkts (%llu bytes) drop:%llu pkts (%llu bytes)\n",
(ull)get_stats.xmit_cnt.packets,
(ull)get_stats.xmit_cnt.bytes,
(ull)get_stats.drop_cnt.packets,
(ull)get_stats.drop_cnt.bytes);
printf(" throughput: %sbps\n",
rate2str(calc_rate(get_stats.xmit_cnt.bytes,
last_bytes, sec)));
last_bytes = get_stats.xmit_cnt.bytes;
last_time = cur_time;
if (count != 0 && --cnt == 0)
break;
/* wait for alarm signal */
if (sigprocmask(SIG_BLOCK, NULL, &omask) == 0)
sigsuspend(&omask);
}
}