From owner-svn-src-user@FreeBSD.ORG  Tue Nov  2 09:16:41 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AC5FB106566B;
	Tue,  2 Nov 2010 09:16:41 +0000 (UTC)
	(envelope-from davidxu@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9AC9C8FC16;
	Tue,  2 Nov 2010 09:16:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oA29Gf27032467;
	Tue, 2 Nov 2010 09:16:41 GMT (envelope-from davidxu@svn.freebsd.org)
Received: (from davidxu@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oA29GfHH032465;
	Tue, 2 Nov 2010 09:16:41 GMT (envelope-from davidxu@svn.freebsd.org)
Message-Id: <201011020916.oA29GfHH032465@svn.freebsd.org>
From: David Xu <davidxu@FreeBSD.org>
Date: Tue, 2 Nov 2010 09:16:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r214670 - user/davidxu/libthr/lib/libthr/thread
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Nov 2010 09:16:41 -0000

Author: davidxu
Date: Tue Nov  2 09:16:41 2010
New Revision: 214670
URL: http://svn.freebsd.org/changeset/base/214670

Log:
  Refetch lockword before retrying.

Modified:
  user/davidxu/libthr/lib/libthr/thread/thr_mutex.c

Modified: user/davidxu/libthr/lib/libthr/thread/thr_mutex.c
==============================================================================
--- user/davidxu/libthr/lib/libthr/thread/thr_mutex.c	Tue Nov  2 09:15:27 2010	(r214669)
+++ user/davidxu/libthr/lib/libthr/thread/thr_mutex.c	Tue Nov  2 09:16:41 2010	(r214670)
@@ -317,6 +317,7 @@ set_lockword(struct pthread_mutex *m)
 	while ((old & MTX_LOCKED) == 0) {
 		if (atomic_cmpset_acq_32(&m->m_lockword, old, old|MTX_LOCKED))
 			return (0);
+		old = m->m_lockword;
 	}
 	return (EBUSY);
 }