From owner-svn-src-user@FreeBSD.ORG  Mon Jan 18 00:43:34 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 6F3F01065672;
	Mon, 18 Jan 2010 00:43:34 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 451278FC17;
	Mon, 18 Jan 2010 00:43:34 +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 o0I0hYCa095364;
	Mon, 18 Jan 2010 00:43:34 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0I0hYB1095361;
	Mon, 18 Jan 2010 00:43:34 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <201001180043.o0I0hYB1095361@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Mon, 18 Jan 2010 00:43:34 +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: r202535 - in user/kmacy/releng_8_rump/lib/libunet: .
	unet_sys
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: Mon, 18 Jan 2010 00:43:34 -0000

Author: kmacy
Date: Mon Jan 18 00:43:33 2010
New Revision: 202535
URL: http://svn.freebsd.org/changeset/base/202535

Log:
  don't use inline sx locks

Modified:
  user/kmacy/releng_8_rump/lib/libunet/Makefile
  user/kmacy/releng_8_rump/lib/libunet/unet_sys/unet_lock.c

Modified: user/kmacy/releng_8_rump/lib/libunet/Makefile
==============================================================================
--- user/kmacy/releng_8_rump/lib/libunet/Makefile	Sun Jan 17 23:23:35 2010	(r202534)
+++ user/kmacy/releng_8_rump/lib/libunet/Makefile	Mon Jan 18 00:43:33 2010	(r202535)
@@ -123,9 +123,11 @@ CFLAGS+=	-I${PREFIX}
 CFLAGS+=	-D_KERNEL
 CFLAGS+=	-DMUTEX_NOINLINE
 CFLAGS+=	-DRWLOCK_NOINLINE
+CFLAGS+=	-DSX_NOINLINE
 CFLAGS+=	-DUNET
 CFLAGS+=	-DMAXUSERS=32
 CFLAGS+=	-fno-builtin
+CFLAGS+=	-O0
 CFLAGS+=	-g
 
 .include <bsd.lib.mk>

Modified: user/kmacy/releng_8_rump/lib/libunet/unet_sys/unet_lock.c
==============================================================================
--- user/kmacy/releng_8_rump/lib/libunet/unet_sys/unet_lock.c	Sun Jan 17 23:23:35 2010	(r202534)
+++ user/kmacy/releng_8_rump/lib/libunet/unet_sys/unet_lock.c	Mon Jan 18 00:43:33 2010	(r202535)
@@ -303,7 +303,7 @@ sx_destroy(struct sx *sx)
 }
 
 int
-_sx_xlock_hard(struct sx *sx, uintptr_t tid, int opts,
+_sx_xlock(struct sx *sx, int opts,
     const char *file, int line)
 {
 	
@@ -312,7 +312,7 @@ _sx_xlock_hard(struct sx *sx, uintptr_t 
 }
 
 int
-_sx_slock_hard(struct sx *sx, int opts, const char *file, int line)
+_sx_slock(struct sx *sx, int opts, const char *file, int line)
 {
 	
 	_rw_rlock((struct rwlock *)sx, file, line);
@@ -320,15 +320,14 @@ _sx_slock_hard(struct sx *sx, int opts, 
 }
 
 void
-_sx_xunlock_hard(struct sx *sx, uintptr_t tid, const char *file, int
-    line)
+_sx_xunlock(struct sx *sx, const char *file, int line)
 {
 	
 	_rw_wunlock((struct rwlock *)sx, file, line);
 }
 
 void
-_sx_sunlock_hard(struct sx *sx, const char *file, int line)
+_sx_sunlock(struct sx *sx, const char *file, int line)
 {
 	
 	_rw_runlock((struct rwlock *)sx, file, line);