Date: Tue, 5 Jan 2010 04:07:30 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r201548 - user/kmacy/releng_8_rump/lib/libunet Message-ID: <201001050407.o0547UEi081404@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Tue Jan 5 04:07:30 2010 New Revision: 201548 URL: http://svn.freebsd.org/changeset/base/201548 Log: - remove reference to spinlocks in unet_kern_timeout - define critical sections as thread bucket locks - make intr_event_bind return ENOTSUP - remove the bulk of libkern as it should all be provided by libc Modified: user/kmacy/releng_8_rump/lib/libunet/Makefile user/kmacy/releng_8_rump/lib/libunet/unet_kern_intr.c user/kmacy/releng_8_rump/lib/libunet/unet_kern_timeout.c user/kmacy/releng_8_rump/lib/libunet/unet_uma_core.c Modified: user/kmacy/releng_8_rump/lib/libunet/Makefile ============================================================================== --- user/kmacy/releng_8_rump/lib/libunet/Makefile Tue Jan 5 03:39:31 2010 (r201547) +++ user/kmacy/releng_8_rump/lib/libunet/Makefile Tue Jan 5 04:07:30 2010 (r201548) @@ -80,17 +80,7 @@ UNET_NETINET_COMMON_OBJS += \ UNET_LIBKERN_COMMON_OBJS = \ arc4random.o \ - bcmp.o \ - inet_aton.o \ - inet_ntoa.o \ - memcmp.o \ - strcat.o \ - strcmp.o \ - strcpy.o \ - strlcpy.o \ - strlen.o \ - strncmp.o \ - strtoul.o + strlcpy.o UNET_OTHER_COMMON_OBJS = \ harvest.o @@ -101,15 +91,15 @@ UNET_GLUE_COMMON_OBJS = \ unet_in_cksum.o \ unet_init_main.o \ unet_lock.o \ - unet_uma_core.c \ unet_kern_condvar.o \ unet_kern_descrip.o \ unet_kern_intr.o \ unet_kern_synch.o \ unet_kern_subr.o \ unet_kern_timeout.o \ - unet_subr_taskqueue.o - + unet_subr_taskqueue.o \ + unet_uma_core.c +# # unet_init.o \ # unet_uipc_syscalls.o # unet_sys_generic.o Modified: user/kmacy/releng_8_rump/lib/libunet/unet_kern_intr.c ============================================================================== --- user/kmacy/releng_8_rump/lib/libunet/unet_kern_intr.c Tue Jan 5 03:39:31 2010 (r201547) +++ user/kmacy/releng_8_rump/lib/libunet/unet_kern_intr.c Tue Jan 5 04:07:30 2010 (r201548) @@ -39,9 +39,7 @@ int intr_event_bind(struct intr_event *ie, u_char cpu) { - panic(""); - return (0); - + return (ENOTSUP); } Modified: user/kmacy/releng_8_rump/lib/libunet/unet_kern_timeout.c ============================================================================== --- user/kmacy/releng_8_rump/lib/libunet/unet_kern_timeout.c Tue Jan 5 03:39:31 2010 (r201547) +++ user/kmacy/releng_8_rump/lib/libunet/unet_kern_timeout.c Tue Jan 5 04:07:30 2010 (r201548) @@ -81,8 +81,8 @@ struct callout_cpu cc_cpu; #define CC_CPU(cpu) &cc_cpu #define CC_SELF() &cc_cpu #endif -#define CC_LOCK(cc) mtx_lock_spin(&(cc)->cc_lock) -#define CC_UNLOCK(cc) mtx_unlock_spin(&(cc)->cc_lock) +#define CC_LOCK(cc) mtx_lock(&(cc)->cc_lock) +#define CC_UNLOCK(cc) mtx_unlock(&(cc)->cc_lock) static int timeout_cpu; Modified: user/kmacy/releng_8_rump/lib/libunet/unet_uma_core.c ============================================================================== --- user/kmacy/releng_8_rump/lib/libunet/unet_uma_core.c Tue Jan 5 03:39:31 2010 (r201547) +++ user/kmacy/releng_8_rump/lib/libunet/unet_uma_core.c Tue Jan 5 04:07:30 2010 (r201548) @@ -284,6 +284,25 @@ SYSCTL_PROC(_vm, OID_AUTO, zone_count, C SYSCTL_PROC(_vm, OID_AUTO, zone_stats, CTLFLAG_RD|CTLTYPE_STRUCT, 0, 0, sysctl_vm_zone_stats, "s,struct uma_type_header", "Zone Stats"); +void +lock_thread_bucket(void) +{ + + panic(""); +} + +void +unlock_thread_bucket(void) +{ + + panic(""); +} + + +#define critical_enter() lock_thread_bucket() +#define critical_exit() unlock_thread_bucket() + + /* * This routine checks to see whether or not it's safe to enable buckets. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001050407.o0547UEi081404>