Hi,
this is just another bunch of typos, but it breaks any attempts to write
altq discipline independent macros, for functions using statistics.
giovanni pointed out net/pfstat uses this too, so if you know of other
ports, either let me know or fix them.
Anyone willing to commit?
Thanks.
--
Martin Pelikan
Index: sbin/pfctl/pfctl_qstats.c
===================================================================
RCS file: /cvs/src/sbin/pfctl/pfctl_qstats.c,v
retrieving revision 1.32
diff -u -p -r1.32 pfctl_qstats.c
--- sbin/pfctl/pfctl_qstats.c 4 Jul 2011 22:49:03 -0000 1.32
+++ sbin/pfctl/pfctl_qstats.c 25 Aug 2011 00:29:20 -0000
@@ -297,7 +297,7 @@ print_cbqstats(struct queue_stats cur)
(unsigned long long)cur.data.cbq_stats.drop_cnt.packets,
(unsigned long long)cur.data.cbq_stats.drop_cnt.bytes);
printf(" [ qlength: %3d/%3d borrows: %6u suspends: %6u ]\n",
- cur.data.cbq_stats.qcnt, cur.data.cbq_stats.qmax,
+ cur.data.cbq_stats.qlength, cur.data.cbq_stats.qmax,
cur.data.cbq_stats.borrows, cur.data.cbq_stats.delays);
if (cur.avgn < 2)
@@ -313,10 +313,10 @@ print_priqstats(struct queue_stats cur)
{
printf(" [ pkts: %10llu bytes: %10llu "
"dropped pkts: %6llu bytes: %6llu ]\n",
- (unsigned long long)cur.data.priq_stats.xmitcnt.packets,
- (unsigned long long)cur.data.priq_stats.xmitcnt.bytes,
- (unsigned long long)cur.data.priq_stats.dropcnt.packets,
- (unsigned long long)cur.data.priq_stats.dropcnt.bytes);
+ (unsigned long long)cur.data.priq_stats.xmit_cnt.packets,
+ (unsigned long long)cur.data.priq_stats.xmit_cnt.bytes,
+ (unsigned long long)cur.data.priq_stats.drop_cnt.packets,
+ (unsigned long long)cur.data.priq_stats.drop_cnt.bytes);
printf(" [ qlength: %3d/%3d ]\n",
cur.data.priq_stats.qlength, cur.data.priq_stats.qlimit);
@@ -381,8 +381,8 @@ update_avg(struct pf_altq_node *a)
p = qs->data.cbq_stats.xmit_cnt.packets;
break;
case ALTQT_PRIQ:
- b = qs->data.priq_stats.xmitcnt.bytes;
- p = qs->data.priq_stats.xmitcnt.packets;
+ b = qs->data.priq_stats.xmit_cnt.bytes;
+ p = qs->data.priq_stats.xmit_cnt.packets;
break;
case ALTQT_HFSC:
b = qs->data.hfsc_stats.xmit_cnt.bytes;
Index: sys/altq/altq_cbq.c
===================================================================
RCS file: /cvs/src/sys/altq/altq_cbq.c,v
retrieving revision 1.26
diff -u -p -r1.26 altq_cbq.c
--- sys/altq/altq_cbq.c 3 Jul 2011 23:59:43 -0000 1.26
+++ sys/altq/altq_cbq.c 25 Aug 2011 00:29:20 -0000
@@ -173,7 +173,7 @@ get_class_stats(class_stats_t *statsp, s
statsp->qmax = qlimit(cl->q_);
statsp->ns_per_byte = cl->ns_per_byte_;
statsp->wrr_allot = cl->w_allotment_;
- statsp->qcnt = qlen(cl->q_);
+ statsp->qlength = qlen(cl->q_);
statsp->avgidle = cl->avgidle_;
statsp->qtype = qtype(cl->q_);
Index: sys/altq/altq_cbq.h
===================================================================
RCS file: /cvs/src/sys/altq/altq_cbq.h,v
retrieving revision 1.13
diff -u -p -r1.13 altq_cbq.h
--- sys/altq/altq_cbq.h 4 Jul 2011 01:07:43 -0000 1.13
+++ sys/altq/altq_cbq.h 25 Aug 2011 00:29:20 -0000
@@ -81,7 +81,7 @@ typedef struct _cbq_class_stats_ {
int ns_per_byte;
int wrr_allot;
- int qcnt; /* # packets in queue */
+ int qlength; /* # packets in queue */
int avgidle;
/* red and rio related info */
Index: sys/altq/altq_priq.c
===================================================================
RCS file: /cvs/src/sys/altq/altq_priq.c,v
retrieving revision 1.24
diff -u -p -r1.24 altq_priq.c
--- sys/altq/altq_priq.c 3 Jul 2011 23:59:43 -0000 1.24
+++ sys/altq/altq_priq.c 25 Aug 2011 00:29:21 -0000
@@ -477,8 +477,8 @@ get_class_stats(struct priq_classstats *
sp->qlength = qlen(cl->cl_q);
sp->qlimit = qlimit(cl->cl_q);
sp->period = cl->cl_period;
- sp->xmitcnt = cl->cl_xmitcnt;
- sp->dropcnt = cl->cl_dropcnt;
+ sp->xmit_cnt = cl->cl_xmitcnt;
+ sp->drop_cnt = cl->cl_dropcnt;
sp->qtype = qtype(cl->cl_q);
#ifdef ALTQ_RED
Index: sys/altq/altq_priq.h
===================================================================
RCS file: /cvs/src/sys/altq/altq_priq.h,v
retrieving revision 1.8
diff -u -p -r1.8 altq_priq.h
--- sys/altq/altq_priq.h 3 Jul 2011 23:48:41 -0000 1.8
+++ sys/altq/altq_priq.h 25 Aug 2011 00:29:21 -0000
@@ -54,8 +54,8 @@ struct priq_classstats {
u_int qlength;
u_int qlimit;
u_int period;
- struct pktcntr xmitcnt; /* transmitted packet counter */
- struct pktcntr dropcnt; /* dropped packet counter */
+ struct pktcntr xmit_cnt; /* transmitted packet counter */
+ struct pktcntr drop_cnt; /* dropped packet counter */
/* red and rio related info */
int qtype;
Index: usr.bin/systat/pftop.c
===================================================================
RCS file: /cvs/src/usr.bin/systat/pftop.c,v
retrieving revision 1.19
diff -u -p -r1.19 pftop.c
--- usr.bin/systat/pftop.c 5 Apr 2011 15:07:46 -0000 1.19
+++ usr.bin/systat/pftop.c 25 Aug 2011 00:29:31 -0000
@@ -1738,7 +1738,7 @@ print_queue(struct pf_altq_node *node)
node->qstats.data.cbq_stats.drop_cnt.packets);
print_fld_size(FLD_DROPB,
node->qstats.data.cbq_stats.drop_cnt.bytes);
- print_fld_size(FLD_QLEN, node->qstats.data.cbq_stats.qcnt);
+ print_fld_size(FLD_QLEN, node->qstats.data.cbq_stats.qlength);
print_fld_size(FLD_BORR, node->qstats.data.cbq_stats.borrows);
print_fld_size(FLD_SUSP, node->qstats.data.cbq_stats.delays);
if (interval > 0) {
@@ -1751,19 +1751,19 @@ print_queue(struct pf_altq_node *node)
case ALTQT_PRIQ:
print_fld_str(FLD_SCHED, "priq");
print_fld_size(FLD_PKTS,
- node->qstats.data.priq_stats.xmitcnt.packets);
+ node->qstats.data.priq_stats.xmit_cnt.packets);
print_fld_size(FLD_BYTES,
- node->qstats.data.priq_stats.xmitcnt.bytes);
+ node->qstats.data.priq_stats.xmit_cnt.bytes);
print_fld_size(FLD_DROPP,
- node->qstats.data.priq_stats.dropcnt.packets);
+ node->qstats.data.priq_stats.drop_cnt.packets);
print_fld_size(FLD_DROPB,
- node->qstats.data.priq_stats.dropcnt.bytes);
+ node->qstats.data.priq_stats.drop_cnt.bytes);
print_fld_size(FLD_QLEN, node->qstats.data.priq_stats.qlength);
if (interval > 0) {
- pps =
calc_pps(node->qstats.data.priq_stats.xmitcnt.packets,
-
node->qstats_last.data.priq_stats.xmitcnt.packets, interval);
- bps =
calc_rate(node->qstats.data.priq_stats.xmitcnt.bytes,
-
node->qstats_last.data.priq_stats.xmitcnt.bytes, interval);
+ pps =
calc_pps(node->qstats.data.priq_stats.xmit_cnt.packets,
+
node->qstats_last.data.priq_stats.xmit_cnt.packets, interval);
+ bps =
calc_rate(node->qstats.data.priq_stats.xmit_cnt.bytes,
+
node->qstats_last.data.priq_stats.xmit_cnt.bytes, interval);
}
break;
case ALTQT_HFSC:
