Date: Fri, 16 May 2014 18:27:42 +0400 From: Gleb Smirnoff <glebius@FreeBSD.org> To: Don Lewis <truckman@FreeBSD.org> Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r265408 - in head: sys/netinet usr.bin/netstat Message-ID: <20140516142742.GJ50679@FreeBSD.org> In-Reply-To: <201405142016.s4EKGfOb084324@gw.catspoiler.org> References: <201405060000.s46007s6044383@svn.freebsd.org> <201405142016.s4EKGfOb084324@gw.catspoiler.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, May 14, 2014 at 01:16:41PM -0700, Don Lewis wrote: D> On 6 May, Gleb Smirnoff wrote: D> > Author: glebius D> > Date: Tue May 6 00:00:07 2014 D> > New Revision: 265408 D> > URL: http://svnweb.freebsd.org/changeset/base/265408 D> > D> > Log: D> > - Remove net.inet.tcp.reass.overflows sysctl. It counts exactly D> > same events that tcpstat's tcps_rcvmemdrop counter counts. D> > - Rename tcps_rcvmemdrop to tcps_rcvreassfull and improve its D> > description in netstat(1) output. D> > D> > Sponsored by: Netflix D> > Sponsored by: Nginx, Inc. D> > D> > Modified: D> > head/sys/netinet/tcp_reass.c D> > head/sys/netinet/tcp_var.h D> > head/usr.bin/netstat/inet.c D> > D> D> D> > Modified: head/sys/netinet/tcp_var.h D> > ============================================================================== D> > --- head/sys/netinet/tcp_var.h Mon May 5 23:54:13 2014 (r265407) D> > +++ head/sys/netinet/tcp_var.h Tue May 6 00:00:07 2014 (r265408) D> > @@ -426,7 +426,7 @@ struct tcpstat { D> > uint64_t tcps_rcvbyte; /* bytes received in sequence */ D> > uint64_t tcps_rcvbadsum; /* packets received with ccksum errs */ D> > uint64_t tcps_rcvbadoff; /* packets received with bad offset */ D> > - uint64_t tcps_rcvmemdrop; /* packets dropped for lack of memory */ D> > + uint64_t tcps_rcvreassfull; /* packets dropped for no reass space */ D> > uint64_t tcps_rcvshort; /* packets received too short */ D> > uint64_t tcps_rcvduppack; /* duplicate-only packets received */ D> > uint64_t tcps_rcvdupbyte; /* duplicate-only bytes received */ D> D> This broke emulators/wine: D> D> cc -c -I. -I. -I../../include -I../../include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body -Wignored-qualifiers -Wstrict-prototypes -Wtype-limits -Wwrite-strings -Wpointer-arith -fno-omit-frame-pointer -I/usr/local/include -O2 -pipe -march=athlon64 -fno-strict-aliasing -o ipstats.o ipstats.c D> ipstats.c:1109:92: error: no member named 'tcps_rcvmemdrop' in 'struct tcpstat'; D> did you mean 'tcps_listendrop'? D> ...+ tcp_stat.tcps_rcvbadoff + tcp_stat.tcps_rcvmemdrop + D> tcp_stat.tcps_rcv... D> ^~~~~~~~~~~~~~~ D> D> I think this needs a __FreeBSD_version 1100020 and/or the addition D> of a #define as a compatiblity crutch. I will add a #define as soon as I get proper Internet connection. -- Totus tuus, Glebius.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140516142742.GJ50679>