svn commit: r202535 - in user/kmacy/releng_8_rump/lib/libunet: .
unet_sys
Kip Macy
kmacy at FreeBSD.org
Mon Jan 18 00:43:34 UTC 2010
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);
More information about the svn-src-user
mailing list