From owner-cvs-src@FreeBSD.ORG Wed May 11 11:26:24 2005 Return-Path: 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 D703E16A4CE; Wed, 11 May 2005 11:26:24 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C56E943D62; Wed, 11 May 2005 11:26:24 +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 j4BBQOPu062709; Wed, 11 May 2005 11:26:24 GMT (envelope-from glebius@repoman.freebsd.org) Received: (from glebius@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4BBQOdL062708; Wed, 11 May 2005 11:26:24 GMT (envelope-from glebius) Message-Id: <200505111126.j4BBQOdL062708@repoman.freebsd.org> From: Gleb Smirnoff Date: Wed, 11 May 2005 11:26:24 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/netgraph/netflow netflow.c netflow.h ng_netflow.c ng_netflow.h X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 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: Wed, 11 May 2005 11:26:25 -0000 glebius 2005-05-11 11:26:24 UTC FreeBSD src repository Modified files: sys/netgraph/netflow netflow.c netflow.h ng_netflow.c ng_netflow.h Log: A new version of NetFlow node. The most significant changes are: - Use UMA zone instead of own chunk of memory. - Lock each hash entry separately. - Expire items "actively" - interrupt method can expire flows from hash slot, when it searches through it. - Remove global tailqueue. Make callout thread search through every hash slot. - Export datagram is detached from private data and filled. If it is incomplete, it is attached back. Another thread will continue working with it. Lesser, but also important speedups: - Flows in hash slot are stored in tailqueue. Whenever a flow is hit, it is moved to the begging, so it can be located quicker. - When callout thread works with hash slot it bails out if slot mutex is contested. Revision Changes Path 1.13 +293 -269 src/sys/netgraph/netflow/netflow.c 1.3 +5 -0 src/sys/netgraph/netflow/netflow.h 1.9 +10 -3 src/sys/netgraph/netflow/ng_netflow.c 1.6 +32 -30 src/sys/netgraph/netflow/ng_netflow.h