From owner-svn-src-user@FreeBSD.ORG  Fri Jan 15 23:02:46 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 C354E1065692;
	Fri, 15 Jan 2010 23:02:46 +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 9941E8FC12;
	Fri, 15 Jan 2010 23:02:46 +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 o0FN2kYo015725;
	Fri, 15 Jan 2010 23:02:46 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0FN2kOW015723;
	Fri, 15 Jan 2010 23:02:46 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <201001152302.o0FN2kOW015723@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Fri, 15 Jan 2010 23:02:46 +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: r202423 - 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 &quot; user&quot;
	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: Fri, 15 Jan 2010 23:02:46 -0000

Author: luigi
Date: Fri Jan 15 23:02:46 2010
New Revision: 202423
URL: http://svn.freebsd.org/changeset/base/202423

Log:
  update docs

Modified:
  user/luigi/ipfw3-head/sys/netinet/ipfw/dummynet.txt

Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/dummynet.txt
==============================================================================
--- user/luigi/ipfw3-head/sys/netinet/ipfw/dummynet.txt	Fri Jan 15 23:02:19 2010	(r202422)
+++ user/luigi/ipfw3-head/sys/netinet/ipfw/dummynet.txt	Fri Jan 15 23:02:46 2010	(r202423)
@@ -133,33 +133,22 @@ KERNEL REPRESENTATION
 	DELETE: manual, see new_sch_inst
 
 
-                                +--------------+
-  +------------+   ptr_sched    |  fsk_list    |
-  |  NEW_FSK   |--------------->|   NEW_SCHK   |<----.
-  |  refcnt    |                |   new_pipe   |     |
-  |  sch_chain |                +--------------+     |
-  +------------+                | hash table   |     |
-          ^                     |    (m1)      |     |
-          |                     +--------------+     |
-          |                        |  .....   \      |
-   -----------+     ...            v           \     |
-  | NEW_QUEUE |<-----|          --------------  `    |
-  +-----------+      |         |              | |    |
-       ....          |         | new_sch_inst | |    |
-   -----------+      |         |              | |    |
-  | NEW_QUEUE |<-----|          --------------  |    |
-  +-----------+      |                          v    |
-      |       .--------------.       --------------  |
-      |       |  hash table  |      |              | |
-      |       |     (m2) +   |<-----| NEW_SCH_INST |_|
-      |       | new_sch_inst |      |  ql_head     |
-      |       `--------------'       --------------
-      |                                 ^
-      |                                 |
-      `---------------------------------'
-
-Note that the hash table m2 is not mandatory, a scheduler instance
-can use its own struct to store its queues
+	fshash                            schedhash
+      +---------------+   sched        +--------------+
+      |      sched-------------------->|      NEW_SCHK|
+  -<----*sch_chain    |<-----------------*fsk_list    |
+      |NEW_FSK        |<----.          | [new_pipe]   |
+      +---------------+     |          +--------------+
+      |qht (hash)     |     |          |  siht(hash)  |
+      |  [new_queue]  |     |          | [new_si]     |
+      |  [new_queue]  |     |          | [new_si]     |
+      |     ...       |     |          |   ...        |
+      |  +---------+  |     |          | +---------+  |
+      |  |new_queue|  |     |          | |new_si   |  |
+      |  |    fs *----------'          | |         |  |
+      |  |    si *---------------------->|         |  |
+      |  +---------+  |                | +---------+  |
+      +---------------+                +--------------+
 
 The following global data structures contain all
 schedulers and flowsets.