From owner-cvs-src@FreeBSD.ORG Tue Sep 7 23:27:07 2004 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 CA69416A4CE; Tue, 7 Sep 2004 23:27:07 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BD9FD43D58; Tue, 7 Sep 2004 23:27:07 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i87NR7M6045741; Tue, 7 Sep 2004 23:27:07 GMT (envelope-from rwatson@repoman.freebsd.org) Received: (from rwatson@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i87NR7BI045740; Tue, 7 Sep 2004 23:27:07 GMT (envelope-from rwatson) Message-Id: <200409072327.i87NR7BI045740@repoman.freebsd.org> From: Robert Watson Date: Tue, 7 Sep 2004 23:27:07 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_5 Subject: cvs commit: src/sys/kern uipc_socket.c 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: Tue, 07 Sep 2004 23:27:08 -0000 rwatson 2004-09-07 23:27:07 UTC FreeBSD src repository Modified files: (Branch: RELENG_5) sys/kern uipc_socket.c Log: Merge uipc_socket.c:1.212 to RELENG_5: date: 2004/09/05 14:33:21; author: rwatson; state: Exp; lines: +4 -4 Expand the scope of the socket buffer locks in sopoll() to include the state test as well as set, or we risk a race between a socket wakeup and registering for select() or poll() on the socket. This does increase the cost of the poll operation, but can probably be optimized some in the future. This appears to correct poll() "wedges" experienced with X11 on SMP systems with highly interactive applications, and might affect a plethora of other select() driven applications. RELENG_5 candidate. Problem reported by: Maxim Maximov Debugged with help of: dwhite Approved by: re (scottl) Revision Changes Path 1.208.2.2 +4 -4 src/sys/kern/uipc_socket.c