From owner-cvs-src@FreeBSD.ORG Sun Jan 15 00:46:18 2006 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 389AC16A41F; Sun, 15 Jan 2006 00:46:18 +0000 (GMT) (envelope-from glebius@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0196043D45; Sun, 15 Jan 2006 00:46:18 +0000 (GMT) (envelope-from glebius@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0F0kHAL020871; Sun, 15 Jan 2006 00:46:17 GMT (envelope-from glebius@repoman.freebsd.org) Received: (from glebius@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0F0kHG6020870; Sun, 15 Jan 2006 00:46:17 GMT (envelope-from glebius) Message-Id: <200601150046.k0F0kHG6020870@repoman.freebsd.org> From: Gleb Smirnoff Date: Sun, 15 Jan 2006 00:46:17 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_6 Cc: Subject: cvs commit: src/sys/netinet ip_dummynet.c ip_dummynet.h X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Jan 2006 00:46:18 -0000 glebius 2006-01-15 00:46:17 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) sys/netinet ip_dummynet.c ip_dummynet.h Log: MFC: First step in removing welding between ipfw(4) and dummynet. o Do not use ipfw_insn_pipe->pipe_ptr in locate_flowset(). The _ipfw_insn_pipe isn't touched by this commit to preserve ABI compatibility. o To optimize the lookup of the pipe/flowset in locate_flowset() introduce hashes for pipes and queues: - To preserve ABI compatibility utilize the place of global list pointer for SLIST_ENTRY. - Introduce locate_flowset(queue nr) and locate_pipe(pipe nr). o Rework all the dummynet code to deal with the hashes, not global lists. Also did some style(9) changes in the code blocks that were touched by this sweep: - Be conservative about flowset and pipe variable names on stack, use "fs" and "pipe" everywhere. - Cleanup whitespaces. - Sort variables. - Give variables more meaningful names. - Uppercase and dots in comments. - ENOMEM when malloc(9) failed. Revision Changes Path 1.93.2.1 +282 -287 src/sys/netinet/ip_dummynet.c 1.36.2.1 +5 -3 src/sys/netinet/ip_dummynet.h