From owner-cvs-all@FreeBSD.ORG Fri Nov 25 14:23:28 2005 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7B1C816A41F; Fri, 25 Nov 2005 14:23:28 +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 373B443D53; Fri, 25 Nov 2005 14:23:28 +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 jAPENSSF021701; Fri, 25 Nov 2005 14:23:28 GMT (envelope-from glebius@repoman.freebsd.org) Received: (from glebius@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAPENSFa021700; Fri, 25 Nov 2005 14:23:28 GMT (envelope-from glebius) Message-Id: <200511251423.jAPENSFa021700@repoman.freebsd.org> From: Gleb Smirnoff Date: Fri, 25 Nov 2005 14:23:28 +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/netgraph netgraph.h ng_base.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Nov 2005 14:23:28 -0000 glebius 2005-11-25 14:23:28 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) sys/netgraph netgraph.h ng_base.c Log: Sync with HEAD, merging the following: revision 1.117 date: 2005/11/02 15:23:47; author: glebius; state: Exp; lines: +47 -8 Fix two races which happen when netgraph is restructuring: - Introduce ng_topo_mtx, a mutex to protect topology changes. - In ng_destroy_node() protect with ng_topo_mtx the process of checking and pointing at ng_deadnode. [1] - In ng_con_part2() check that our peer is not a ng_deadnode, and protect the check with ng_topo_mtx. - Add KASSERTs to ng_acquire_read/write, to make more understandible synopsis in case if called on ng_deadnode. Reported by: Roselyn Lee [1] ---------------------------- revision 1.116 date: 2005/11/02 14:27:24; author: glebius; state: Exp; lines: +106 -121 Rework the ng_item queueing on nodes: - Introduce a new flags NGQF_QREADER and NGQF_QWRITER, which tell how the item should be actually applied, overriding NGQF_READER/NGQF_WRITER flags. - Do not differ between pending reader or writer. Use only one flag that is raised, when there are pending items. - Schedule netgraph ISR in ng_queue_rw(), so that callers do not need to do this job. - Fix several comments. Submitted by: julian As well as some lesser changes: ng_base.c 1.114, 1.113, 1.107, 1.118. Revision Changes Path 1.55.2.4 +41 -32 src/sys/netgraph/netgraph.h 1.102.2.7 +254 -238 src/sys/netgraph/ng_base.c