From owner-cvs-all@FreeBSD.ORG Wed Apr 11 09:45:16 2007 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D213916A401; Wed, 11 Apr 2007 09:45:16 +0000 (UTC) (envelope-from andre@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BE91513C480; Wed, 11 Apr 2007 09:45:16 +0000 (UTC) (envelope-from andre@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3B9jGxu015633; Wed, 11 Apr 2007 09:45:16 GMT (envelope-from andre@repoman.freebsd.org) Received: (from andre@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3B9jGwE015632; Wed, 11 Apr 2007 09:45:16 GMT (envelope-from andre) Message-Id: <200704110945.l3B9jGwE015632@repoman.freebsd.org> From: Andre Oppermann Date: Wed, 11 Apr 2007 09:45:16 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/sys/netinet tcp_input.c tcp_output.c tcp_sack.c tcp_subr.c tcp_syncache.c tcp_timer.c tcp_timer.h tcp_usrreq.c tcp_var.h 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: Wed, 11 Apr 2007 09:45:16 -0000 andre 2007-04-11 09:45:16 UTC FreeBSD src repository Modified files: sys/netinet tcp_input.c tcp_output.c tcp_sack.c tcp_subr.c tcp_syncache.c tcp_timer.c tcp_timer.h tcp_usrreq.c tcp_var.h Log: Change the TCP timer system from using the callout system five times directly to a merged model where only one callout, the next to fire, is registered. Instead of callout_reset(9) and callout_stop(9) the new function tcp_timer_activate() is used which then internally manages the callout. The single new callout is a mutex callout on inpcb simplifying the locking a bit. tcp_timer() is the called function which handles all race conditions in one place and then dispatches the individual timer functions. Reviewed by: rwatson (earlier version) Revision Changes Path 1.335 +22 -30 src/sys/netinet/tcp_input.c 1.132 +25 -28 src/sys/netinet/tcp_output.c 1.38 +1 -1 src/sys/netinet/tcp_sack.c 1.274 +14 -15 src/sys/netinet/tcp_subr.c 1.109 +1 -1 src/sys/netinet/tcp_syncache.c 1.90 +300 -176 src/sys/netinet/tcp_timer.c 1.33 +16 -5 src/sys/netinet/tcp_timer.h 1.150 +10 -8 src/sys/netinet/tcp_usrreq.c 1.142 +3 -7 src/sys/netinet/tcp_var.h