From owner-svn-src-user@FreeBSD.ORG Sat Jan 23 00:30:18 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 56AC610656A5;
Sat, 23 Jan 2010 00:30:18 +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 2D6D98FC16;
Sat, 23 Jan 2010 00:30:18 +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 o0N0UIYx040227;
Sat, 23 Jan 2010 00:30:18 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0N0UIqi040225;
Sat, 23 Jan 2010 00:30:18 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <201001230030.o0N0UIqi040225@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Sat, 23 Jan 2010 00:30:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r202851 - user/luigi/ipfw3-head/sys/netinet/ipfw
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Jan 2010 00:30:18 -0000
Author: luigi
Date: Sat Jan 23 00:30:17 2010
New Revision: 202851
URL: http://svn.freebsd.org/changeset/base/202851
Log:
simplify the testing code
Modified:
user/luigi/ipfw3-head/sys/netinet/ipfw/test_dn_sched.c
Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/test_dn_sched.c
==============================================================================
--- user/luigi/ipfw3-head/sys/netinet/ipfw/test_dn_sched.c Sat Jan 23 00:24:31 2010 (r202850)
+++ user/luigi/ipfw3-head/sys/netinet/ipfw/test_dn_sched.c Sat Jan 23 00:30:17 2010 (r202851)
@@ -54,6 +54,8 @@ dn_delete_queue(void *_q, void *do_free)
}
/*
+ * This is a simplified function for testing purposes, which does
+ * not implement statistics or random loss.
* Enqueue a packet in q, subject to space and queue management policy
* (whose parameters are in q->fs).
* Update stats for the queue and the scheduler.
@@ -62,39 +64,16 @@ dn_delete_queue(void *_q, void *do_free)
int
dn_enqueue(struct new_queue *q, struct mbuf* m, int drop)
{
- struct new_fs *f;
- struct dn_flow *ni; /* stats for scheduler instance */
- uint64_t len;
-
- f = &q->fs->fs;
- ni = &q->ni;
- len = m->m_pkthdr.len;
- /* Update statistics, then check reasons to drop pkt. */
- q->ni.tot_bytes += len;
- q->ni.tot_pkts++;
- ni->tot_bytes += len;
- ni->tot_pkts++;
if (drop)
goto drop;
- if (f->plr && random() < f->plr)
- goto drop;
- if (f->flags & DN_QSIZE_BYTES) {
- if (q->ni.len_bytes > f->qsize)
- goto drop;
- } else if (q->ni.length >= f->qsize) {
+ if (q->ni.length >= 50)
goto drop;
- }
mq_append(&q->mq, m);
q->ni.length++;
- q->ni.len_bytes += len;
- ni->length++;
- ni->len_bytes += len;
return 0;
drop:
- io_pkt_drop++;
q->ni.drops++;
- ni->drops++;
FREE_PKT(m);
return 1;
}