From owner-p4-projects@FreeBSD.ORG  Sun Dec 26 12:16:33 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E201B16A4D0; Sun, 26 Dec 2004 12:16:32 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A101E16A4CE
	for <perforce@freebsd.org>; Sun, 26 Dec 2004 12:16:32 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8FE8B43D48
	for <perforce@freebsd.org>; Sun, 26 Dec 2004 12:16:32 +0000 (GMT)
	(envelope-from davidxu@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 iBQCGW10019993
	for <perforce@freebsd.org>; Sun, 26 Dec 2004 12:16:32 GMT
	(envelope-from davidxu@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBQCGW4l019990
	for perforce@freebsd.org; Sun, 26 Dec 2004 12:16:32 GMT
	(envelope-from davidxu@freebsd.org)
Date: Sun, 26 Dec 2004 12:16:32 GMT
Message-Id: <200412261216.iBQCGW4l019990@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	davidxu@freebsd.org using -f
From: David Xu <davidxu@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 67720 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Dec 2004 12:16:33 -0000

http://perforce.freebsd.org/chv.cgi?CH=67720

Change 67720 by davidxu@davidxu_tiger on 2004/12/26 12:16:02

	[EAGAIN]
	The mutex could not be acquired because the maximum number of recursive
	locks for mutex has been exceeded.

Affected files ...

.. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex.c#6 edit

Differences ...

==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex.c#6 (text+ko) ====

@@ -936,8 +936,11 @@
 
 	case PTHREAD_MUTEX_RECURSIVE:
 		/* Increment the lock count: */
-		m->m_count++;
-		ret = 0;
+		if (m->m_count + 1 > 0) {
+			m->m_count++;
+			ret = 0;
+		} else
+			ret = EAGAIN;
 		break;
 
 	default:
@@ -982,7 +985,11 @@
 
 	case PTHREAD_MUTEX_RECURSIVE:
 		/* Increment the lock count: */
-		m->m_count++;
+		if (m->m_count + 1 > 0) {
+			m->m_count++;
+			ret = 0;
+		} else
+			ret = EAGAIN;
 		break;
 
 	default: