Date: Tue, 5 Jan 2010 05:43:21 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r201551 - user/kmacy/releng_8_rump/sys/kern Message-ID: <201001050543.o055hLXP002672@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Tue Jan 5 05:43:20 2010 New Revision: 201551 URL: http://svn.freebsd.org/changeset/base/201551 Log: simplify first cut by hiding references to kqueue Modified: user/kmacy/releng_8_rump/sys/kern/uipc_socket.c Modified: user/kmacy/releng_8_rump/sys/kern/uipc_socket.c ============================================================================== --- user/kmacy/releng_8_rump/sys/kern/uipc_socket.c Tue Jan 5 05:40:07 2010 (r201550) +++ user/kmacy/releng_8_rump/sys/kern/uipc_socket.c Tue Jan 5 05:43:20 2010 (r201551) @@ -145,6 +145,7 @@ __FBSDID("$FreeBSD$"); static int soreceive_rcvoob(struct socket *so, struct uio *uio, int flags); +#ifndef UNET static void filt_sordetach(struct knote *kn); static int filt_soread(struct knote *kn, long hint); static void filt_sowdetach(struct knote *kn); @@ -157,7 +158,7 @@ static struct filterops soread_filtops = { 1, NULL, filt_sordetach, filt_soread }; static struct filterops sowrite_filtops = { 1, NULL, filt_sowdetach, filt_sowrite }; - +#endif uma_zone_t socket_zone; so_gen_t so_gencnt; /* generation count for sockets */ @@ -2920,9 +2921,11 @@ sopoll_generic(struct socket *so, int ev return (revents); } + int soo_kqfilter(struct file *fp, struct knote *kn) { +#ifndef UNET struct socket *so = kn->kn_fp->f_data; struct sockbuf *sb; @@ -2946,9 +2949,13 @@ soo_kqfilter(struct file *fp, struct kno knlist_add(&sb->sb_sel.si_note, kn, 1); sb->sb_flags |= SB_KNOTE; SOCKBUF_UNLOCK(sb); +#else + panic("soo_kqfilter not supported"); +#endif return (0); } + /* * Some routines that return EOPNOTSUPP for entry points that are not * supported by a protocol. Fill in as needed. @@ -3089,6 +3096,7 @@ pru_sopoll_notsupp(struct socket *so, in return EOPNOTSUPP; } +#ifndef UNET static void filt_sordetach(struct knote *kn) { @@ -3168,7 +3176,7 @@ filt_solisten(struct knote *kn, long hin kn->kn_data = so->so_qlen; return (! TAILQ_EMPTY(&so->so_comp)); } - +#endif int socheckuid(struct socket *so, uid_t uid) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001050543.o055hLXP002672>