Date: Wed, 24 Jun 2009 19:44:04 -0400 From: Ben Kaduk <minimarmot@gmail.com> To: Oleg Bulyzhin <oleg@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, freebsd-doc@freebsd.org Subject: Re: svn commit: r194930 - in head: sbin/ipfw sys/netinet sys/netinet/ipfw Message-ID: <47d0403c0906241644v70f35ba5r7c6440a45c95c369@mail.gmail.com> In-Reply-To: <200906242257.n5OMv71d032996@svn.freebsd.org> References: <200906242257.n5OMv71d032996@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Jun 24, 2009 at 6:57 PM, Oleg Bulyzhin<oleg@freebsd.org> wrote: > Author: oleg > Date: Wed Jun 24 22:57:07 2009 > New Revision: 194930 > URL: http://svn.freebsd.org/changeset/base/194930 > > Log: > =A0- fix dummynet 'fast' mode for WF2Q case. > =A0- fix printing of pipe profile data. > =A0- introduce new pipe parameter: 'burst' - how much data can be sent th= rough > =A0 =A0pipe bypassing bandwidth limit. > > Modified: > =A0head/sbin/ipfw/Makefile > =A0head/sbin/ipfw/dummynet.c > =A0head/sbin/ipfw/ipfw.8 > =A0head/sbin/ipfw/ipfw2.h > =A0head/sys/netinet/ip_dummynet.h > =A0head/sys/netinet/ipfw/ip_dummynet.c > [snip] > > Modified: head/sbin/ipfw/ipfw.8 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sbin/ipfw/ipfw.8 =A0 =A0 =A0 Wed Jun 24 22:42:52 2009 =A0 =A0 = =A0 =A0(r194929) > +++ head/sbin/ipfw/ipfw.8 =A0 =A0 =A0 Wed Jun 24 22:57:07 2009 =A0 =A0 = =A0 =A0(r194930) > @@ -1,7 +1,7 @@ > =A0.\" > =A0.\" $FreeBSD$ > =A0.\" > -.Dd April 9, 2009 > +.Dd June 24, 2009 > =A0.Dt IPFW 8 > =A0.Os > =A0.Sh NAME > @@ -1943,6 +1943,20 @@ to reduce > =A0the granularity to 1ms or less). > =A0Default value is 0, meaning no delay. > =A0.Pp > +.It Cm burst Ar size > +If the data rate exceeds the pipe bandwith limit > +(and pipe was idle long enough), > +.Ar size > +bytes of data is allowed to bypass the > +.Nm dummynet > +scheduler (i.e. it will be sent without shaping), then transmission rate > +will not exceed pipe bandwidth. Effective burst size calculated as follo= ws: There's a grammar error and a style error, here. I'm actually not entirely sure what the intended meaning is, so it's a bit hard to fix the grammar error. Looking at the code, it seems that in burst mode, extra data will be allowed to be sent, though it is capped to not exceed the pipe bandwidth. Perhaps "... bytes of data is allowed to bypass the dummynet scheduler (...), though the transmission rate will still be capped so as to not exceed the pipe's bandwidth."? The style error is that the new sentence ("Effective burst size ...") should start on a new line. I would also prefer to see the new sentence be an actual complete sentence (i.e., "The effective burst size is calculated as follows"), though there appears to be at least one other bug of this form in the file already (see, for example, the quoted text at the beginning of this hunk: "Default value is no delay.", wh= ich would benefit from a "the".) Unrelated to this commit, there is a grammar error early in the file: 312 Once 313 .Fl p 314 has been specified, any additional arguments as passed on to the pr= eproc essor 315 for interpretation. The 'as' in line 314 should be 'are'. (This is from CVS r1.220, so the line numbers may not be current.) Thanks, Ben Kaduk > +MAX( > +.Ar size > +, > +.Nm bw > +* pipe_idle_time). > +.Pp > =A0.It Cm profile Ar filename > =A0A file specifying the additional overhead incurred in the transmission > =A0of a packet on the link. >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?47d0403c0906241644v70f35ba5r7c6440a45c95c369>