From owner-svn-src-head@FreeBSD.ORG  Sat Feb  5 23:32:18 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F24FF106566C;
	Sat,  5 Feb 2011 23:32:17 +0000 (UTC)
	(envelope-from luigi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E0EB68FC08;
	Sat,  5 Feb 2011 23:32:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p15NWHg1045227;
	Sat, 5 Feb 2011 23:32:17 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p15NWHHE045225;
	Sat, 5 Feb 2011 23:32:17 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <201102052332.p15NWHHE045225@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Sat, 5 Feb 2011 23:32:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218360 - head/sys/netinet/ipfw
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Feb 2011 23:32:18 -0000

Author: luigi
Date: Sat Feb  5 23:32:17 2011
New Revision: 218360
URL: http://svn.freebsd.org/changeset/base/218360

Log:
  correct the 'output_time' of packets generated by dummynet.
  In the dec.2009 rewrite I introduced a bug, using for the
  computation the arrival time instead of the time the packet
  has exited from the queue.
  The bandwidth computation was still correct because it is
  computed elsewhere, but traffic was sent out in bursts.
  
  The bug is also present in RELENG_8 after dec.2009
  
  Thanks to Daikichi Osuga for investingating, finding and fixing the
  bug with detailed graphs of the behaviour before and after the fix.
  
  Submitted by:	Daikichi Osuga
  MFC after:	2 weeks

Modified:
  head/sys/netinet/ipfw/ip_dn_io.c

Modified: head/sys/netinet/ipfw/ip_dn_io.c
==============================================================================
--- head/sys/netinet/ipfw/ip_dn_io.c	Sat Feb  5 23:03:40 2011	(r218359)
+++ head/sys/netinet/ipfw/ip_dn_io.c	Sat Feb  5 23:32:17 2011	(r218360)
@@ -471,7 +471,7 @@ serve_sched(struct mq *q, struct dn_sch_
 			(m->m_pkthdr.len * 8 + extra_bits(m, s));
 		si->credit -= len_scaled;
 		/* Move packet in the delay line */
-		dn_tag_get(m)->output_time += s->link.delay ;
+		dn_tag_get(m)->output_time = dn_cfg.curr_time + s->link.delay ;
 		mq_append(&si->dline.mq, m);
 	}