From owner-freebsd-bugs@FreeBSD.ORG  Wed May  7 21:00:30 2003
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 59FE137B401
	for <freebsd-bugs@hub.freebsd.org>;
	Wed,  7 May 2003 21:00:30 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0497243FB1
	for <freebsd-bugs@hub.freebsd.org>;
	Wed,  7 May 2003 21:00:29 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h4840SUp051869
	for <freebsd-bugs@freefall.freebsd.org>;
	Wed, 7 May 2003 21:00:28 -0700 (PDT)
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h4840SjF051868;
	Wed, 7 May 2003 21:00:28 -0700 (PDT)
Resent-Date: Wed, 7 May 2003 21:00:28 -0700 (PDT)
Resent-Message-Id: <200305080400.h4840SjF051868@freefall.freebsd.org>
Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer)
Resent-To: freebsd-bugs@FreeBSD.org
Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org,
	Ted Stockwell <tedverniernetworks.com@verniernetworks.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 53F0D37B401
	for <FreeBSD-gnats-submit@freebsd.org>;
	Wed,  7 May 2003 21:00:14 -0700 (PDT)
Received: from verniernetworks.com (dns.verniernetworks.com [65.200.185.165])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D1FDC43FDD
	for <FreeBSD-gnats-submit@freebsd.org>;
	Wed,  7 May 2003 21:00:11 -0700 (PDT)
	(envelope-from ted@verniernetworks.com)
Received: from cvs.verniernetworks.com (cvs.verniernetworks.com
	[192.168.10.231])
	by verniernetworks.com (8.12.9/8.11.0) with ESMTP id h4840BJf094655
	for <FreeBSD-gnats-submit@freebsd.org>;
	Wed, 7 May 2003 21:00:11 -0700 (PDT)
	(envelope-from ted@cvs.verniernetworks.com)
Received: (from ted@localhost)
	by cvs.verniernetworks.com (8.11.6/8.11.6) id h4840Bh63824;
	Wed, 7 May 2003 21:00:11 -0700 (PDT)
	(envelope-from ted)
Message-Id: <200305080400.h4840Bh63824@cvs.verniernetworks.com>
Date: Wed, 7 May 2003 21:00:11 -0700 (PDT)
From: Ted Stockwell <ted@verniernetworks.com>
To: FreeBSD-gnats-submit@FreeBSD.org
X-Send-Pr-Version: 3.113
Subject: bin/51949: thread in accept cannot be cancelled
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
Reply-To: Ted Stockwell <tedverniernetworks.com@verniernetworks.com>
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 May 2003 04:00:30 -0000


>Number:         51949
>Category:       bin
>Synopsis:       thread in accept cannot be cancelled
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 07 21:00:28 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Ted Stockwell
>Release:        FreeBSD 4.7-RELEASE i386
>Organization:
>Environment:
>Description:
A thread in a blocking accept() does not terminate
if cancelled with pthread_cancel().

>How-To-Repeat:
>Fix:
--- uthread_accept.c.orig       Tue Apr 29 01:40:14 2003
+++ uthread_accept.c    Wed May  7 18:42:37 2003
@@ -106,7 +106,21 @@
        }
        /* Return the socket file descriptor or -1 on error: */
        return (ret);
 }
 
-__strong_reference(_accept, accept);
+/*
+ * Cancelled threads were stuck in accept().  Code below is 
+ * patterned after uthread_select.c
+ */
+int
+accept(int fd, struct sockaddr * name, socklen_t *namelen)
+{
+       int ret;
+
+       _thread_enter_cancellation_point();
+       ret = _accept(fd, name, namelen);
+       _thread_leave_cancellation_point();
+
+       return ret;
+}
 #endif
>Release-Note:
>Audit-Trail:
>Unformatted: