PERFORCE change 163649 for review

Zhao Shuai zhaoshuai at FreeBSD.org
Sat Jun 6 13:15:06 UTC 2009


http://perforce.freebsd.org/chv.cgi?CH=163649

Change 163649 by zhaoshuai at zhaoshuai on 2009/06/06 13:14:10

	fifoinfo now contains rpipe and wpipe
	fix a bug in fifo_close

Affected files ...

.. //depot/projects/soc2009/fifo/sys/fs/fifofs/fifo_vnops.c#7 edit

Differences ...

==== //depot/projects/soc2009/fifo/sys/fs/fifofs/fifo_vnops.c#7 (text+ko) ====

@@ -3,6 +3,9 @@
  *	The Regents of the University of California.
  * Copyright (c) 2005 Robert N. M. Watson
  * All rights reserved.
+ * 
+ * Copyright (c) 2009 Zhao Shuai <zhaoshuai at FreeBSD.org>
+ * Google Summer of Code project
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -29,50 +32,39 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo_vnops.c	8.10 (Berkeley) 5/27/95
- * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.149 2009/04/10 10:52:19 rwatson Exp $
+ * 
  */
 
 #include <sys/param.h>
-#include <sys/event.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/filio.h>
 #include <sys/fcntl.h>
-#include <sys/kernel.h>
-#include <sys/lock.h>
 #include <sys/mutex.h>
-#include <sys/malloc.h>
-#include <sys/poll.h>
-#include <sys/proc.h>
-#include <sys/signalvar.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/sx.h>
-#include <sys/systm.h>
-#include <sys/un.h>
 #include <sys/unistd.h>
 #include <sys/vnode.h>
+#include <sys/pipe.h>
 #include <fs/fifofs/fifo.h>
 
-static fo_rdwr_t        fifo_read_f;
-static fo_rdwr_t        fifo_write_f;
-static fo_ioctl_t       fifo_ioctl_f;
-static fo_poll_t        fifo_poll_f;
-static fo_kqfilter_t    fifo_kqfilter_f;
-static fo_stat_t        fifo_stat_f;
-static fo_close_t       fifo_close_f;
-static fo_truncate_t    fifo_truncate_f;
+static fo_rdwr_t	fifo_read_f;
+static fo_rdwr_t	fifo_write_f;
+static fo_ioctl_t	fifo_ioctl_f;
+static fo_poll_t	fifo_poll_f;
+static fo_kqfilter_t	fifo_kqfilter_f;
+static fo_stat_t	fifo_stat_f;
+static fo_close_t	fifo_close_f;
+static fo_truncate_t	fifo_truncate_f;
 
 struct fileops fifo_ops_f = {
-	.fo_read =      fifo_read_f,
-	.fo_write =     fifo_write_f,
-	.fo_truncate =  fifo_truncate_f,
-	.fo_ioctl =     fifo_ioctl_f,
-	.fo_poll =      fifo_poll_f,
-	.fo_kqfilter =  fifo_kqfilter_f,
-	.fo_stat =      fifo_stat_f,
-	.fo_close =     fifo_close_f,
-	.fo_flags =     DFLAG_PASSABLE
+	.fo_read =	fifo_read_f,
+	.fo_write =	fifo_write_f,
+	.fo_truncate =	fifo_truncate_f,
+	.fo_ioctl =	fifo_ioctl_f,
+	.fo_poll =	fifo_poll_f,
+	.fo_kqfilter =	fifo_kqfilter_f,
+	.fo_stat =	fifo_stat_f,
+	.fo_close =	fifo_close_f,
+	.fo_flags =	DFLAG_PASSABLE
 };
 
 /*
@@ -80,8 +72,8 @@
  * the state associated with the FIFO.
  */
 struct fifoinfo {
-	struct socket	*fi_readsock;
-	struct socket	*fi_writesock;
+	struct	pipe	*fi_rpipe;
+	struct  pipe	*fi_wpipe;
 	long		fi_readers;
 	long		fi_writers;
 };
@@ -94,23 +86,8 @@
 static vop_pathconf_t	fifo_pathconf;
 static vop_advlock_t	fifo_advlock;
 
-static void	filt_fifordetach(struct knote *kn);
-static int	filt_fiforead(struct knote *kn, long hint);
-static void	filt_fifowdetach(struct knote *kn);
-static int	filt_fifowrite(struct knote *kn, long hint);
-static void	filt_fifodetach_notsup(struct knote *kn);
-static int	filt_fifo_notsup(struct knote *kn, long hint);
-
-static struct filterops fiforead_filtops =
-	{ 1, NULL, filt_fifordetach, filt_fiforead };
-static struct filterops fifowrite_filtops =
-	{ 1, NULL, filt_fifowdetach, filt_fifowrite };
-static struct filterops fifo_notsup_filtops =
-	{ 1, NULL, filt_fifodetach_notsup, filt_fifo_notsup };
-
 struct vop_vector fifo_specops = {
 	.vop_default =		&default_vnodeops,
-
 	.vop_access =		VOP_EBADF,
 	.vop_advlock =		fifo_advlock,
 	.vop_close =		fifo_close,
@@ -137,27 +114,7 @@
 	.vop_write =		VOP_PANIC,
 };
 
-struct mtx fifo_mtx;
-MTX_SYSINIT(fifo, &fifo_mtx, "fifo mutex", MTX_DEF);
-
 /*
- * Dispose of fifo resources.
- */
-static void
-fifo_cleanup(struct vnode *vp)
-{
-	struct fifoinfo *fip = vp->v_fifoinfo;
-
-	ASSERT_VOP_ELOCKED(vp, "fifo_cleanup");
-	if (fip->fi_readers == 0 && fip->fi_writers == 0) {
-		vp->v_fifoinfo = NULL;
-		(void)soclose(fip->fi_readsock);
-		(void)soclose(fip->fi_writesock);
-		free(fip, M_VNODE);
-	}
-}
-
-/*
  * Open called to set up a new instance of a fifo or
  * to find an active instance of a fifo.
  */
@@ -173,11 +130,10 @@
 	} */ *ap;
 {
 	struct vnode *vp = ap->a_vp;
+	struct file *fp = ap->a_fp;
+	struct thread *td = ap->a_td;
 	struct fifoinfo *fip;
-	struct thread *td = ap->a_td;
-	struct ucred *cred = ap->a_cred;
-	struct file *fp = ap->a_fp;
-	struct socket *rso, *wso;
+	struct pipe *rpipe, *wpipe;
 	int error;
 
 	ASSERT_VOP_ELOCKED(vp, "fifo_open");
@@ -185,115 +141,29 @@
 		return (EINVAL);
 	if ((fip = vp->v_fifoinfo) == NULL) {
 		fip = malloc(sizeof(*fip), M_VNODE, M_WAITOK);
-		error = socreate(AF_LOCAL, &rso, SOCK_STREAM, 0, cred, td);
-		if (error)
-			goto fail1;
-		fip->fi_readsock = rso;
-		error = socreate(AF_LOCAL, &wso, SOCK_STREAM, 0, cred, td);
-		if (error)
-			goto fail2;
-		fip->fi_writesock = wso;
-		error = soconnect2(wso, rso);
-		if (error) {
-			(void)soclose(wso);
-fail2:
-			(void)soclose(rso);
-fail1:
+		if (( error = generic_pipe_create(td, &rpipe, &wpipe)) != 0) {
 			free(fip, M_VNODE);
 			return (error);
 		}
+		fip->fi_rpipe = rpipe;
+		fip->fi_wpipe = wpipe;
 		fip->fi_readers = fip->fi_writers = 0;
-		wso->so_snd.sb_lowat = PIPE_BUF;
-		SOCKBUF_LOCK(&rso->so_rcv);
-		rso->so_rcv.sb_state |= SBS_CANTRCVMORE;
-		SOCKBUF_UNLOCK(&rso->so_rcv);
-		KASSERT(vp->v_fifoinfo == NULL,
-		    ("fifo_open: v_fifoinfo race"));
+		KASSERT(vp->v_fifoinfo == NULL, ("fifo_open: v_fifoinfo race"));
 		vp->v_fifoinfo = fip;
 	}
 
 	/*
 	 * General access to fi_readers and fi_writers is protected using
 	 * the vnode lock.
-	 *
-	 * Protect the increment of fi_readers and fi_writers and the
-	 * associated calls to wakeup() with the fifo mutex in addition
-	 * to the vnode lock.  This allows the vnode lock to be dropped
-	 * for the msleep() calls below, and using the fifo mutex with
-	 * msleep() prevents the wakeup from being missed.
 	 */
-	mtx_lock(&fifo_mtx);
-	if (ap->a_mode & FREAD) {
+	if (ap->a_mode & FREAD)
 		fip->fi_readers++;
-		if (fip->fi_readers == 1) {
-			SOCKBUF_LOCK(&fip->fi_writesock->so_snd);
-			fip->fi_writesock->so_snd.sb_state &= ~SBS_CANTSENDMORE;
-			SOCKBUF_UNLOCK(&fip->fi_writesock->so_snd);
-			if (fip->fi_writers > 0) {
-				wakeup(&fip->fi_writers);
-				sowwakeup(fip->fi_writesock);
-			}
-		}
-	}
 	if (ap->a_mode & FWRITE) {
-		if ((ap->a_mode & O_NONBLOCK) && fip->fi_readers == 0) {
-			mtx_unlock(&fifo_mtx);
+		if ((ap->a_mode & O_NONBLOCK) && fip->fi_readers == 0) 
 			return (ENXIO);
-		}
-		fip->fi_writers++;
-		if (fip->fi_writers == 1) {
-			SOCKBUF_LOCK(&fip->fi_readsock->so_rcv);
-			fip->fi_readsock->so_rcv.sb_state &= ~SBS_CANTRCVMORE;
-			SOCKBUF_UNLOCK(&fip->fi_readsock->so_rcv);
-			if (fip->fi_readers > 0) {
-				wakeup(&fip->fi_readers);
-				sorwakeup(fip->fi_readsock);
-			}
-		}
+		fip->fi_writers++;		
 	}
-	if ((ap->a_mode & O_NONBLOCK) == 0) {
-		if ((ap->a_mode & FREAD) && fip->fi_writers == 0) {
-			VOP_UNLOCK(vp, 0);
-			error = msleep(&fip->fi_readers, &fifo_mtx,
-			    PDROP | PCATCH | PSOCK, "fifoor", 0);
-			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
-			if (error) {
-				fip->fi_readers--;
-				if (fip->fi_readers == 0) {
-					socantsendmore(fip->fi_writesock);
-					fifo_cleanup(vp);
-				}
-				return (error);
-			}
-			mtx_lock(&fifo_mtx);
-			/*
-			 * We must have got woken up because we had a writer.
-			 * That (and not still having one) is the condition
-			 * that we must wait for.
-			 */
-		}
-		if ((ap->a_mode & FWRITE) && fip->fi_readers == 0) {
-			VOP_UNLOCK(vp, 0);
-			error = msleep(&fip->fi_writers, &fifo_mtx,
-			    PDROP | PCATCH | PSOCK, "fifoow", 0);
-			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
-			if (error) {
-				fip->fi_writers--;
-				if (fip->fi_writers == 0) {
-					socantrcvmore(fip->fi_readsock);
-					fifo_cleanup(vp);
-				}
-				return (error);
-			}
-			/*
-			 * We must have got woken up because we had
-			 * a reader.  That (and not still having one)
-			 * is the condition that we must wait for.
-			 */
-			mtx_lock(&fifo_mtx);
-		}
-	}
-	mtx_unlock(&fifo_mtx);
+
 	KASSERT(fp != NULL, ("can't fifo/vnode bypass"));
 	KASSERT(fp->f_ops == &badfileops, ("not badfileops in fifo_open"));
 	finit(fp, fp->f_flag, DTYPE_FIFO, fip, &fifo_ops_f);
@@ -301,6 +171,40 @@
 }
 
 /*
+ * Device close routine
+ */
+/* ARGSUSED */
+static int
+fifo_close(ap)
+	struct vop_close_args /* {
+		struct vnode *a_vp;
+		int	a_fflag;
+		struct ucred *a_cred;
+		struct thread *a_td;
+	} */ *ap;
+{
+	struct vnode *vp = ap->a_vp;
+	struct fifoinfo *fip = vp->v_fifoinfo;
+
+	ASSERT_VOP_ELOCKED(vp, "fifo_close");
+	if (ap->a_fflag & FREAD) {
+		fip->fi_readers--;
+		if (fip->fi_readers == 0) 
+			generic_pipe_close(fip->fi_rpipe);
+	}
+	if (ap->a_fflag & FWRITE) {
+		fip->fi_writers--;
+		if (fip->fi_writers == 0) 
+			generic_pipe_close(fip->fi_wpipe);
+	}
+	if (fip->fi_readers == 0 && fip->fi_writers == 0) {
+		vp->v_fifoinfo = NULL;
+		free(fip, M_VNODE);
+	}
+	return (0);
+}
+
+/*
  * Now unused vnode ioctl routine.
  */
 /* ARGSUSED */
@@ -336,125 +240,20 @@
 	return (EINVAL);
 }
 
-static void
-filt_fifordetach(struct knote *kn)
-{
-	struct socket *so = (struct socket *)kn->kn_hook;
-
-	SOCKBUF_LOCK(&so->so_rcv);
-	knlist_remove(&so->so_rcv.sb_sel.si_note, kn, 1);
-	if (knlist_empty(&so->so_rcv.sb_sel.si_note))
-		so->so_rcv.sb_flags &= ~SB_KNOTE;
-	SOCKBUF_UNLOCK(&so->so_rcv);
-}
-
-static int
-filt_fiforead(struct knote *kn, long hint)
-{
-	struct socket *so = (struct socket *)kn->kn_hook;
-
-	SOCKBUF_LOCK_ASSERT(&so->so_rcv);
-	kn->kn_data = so->so_rcv.sb_cc;
-	if (so->so_rcv.sb_state & SBS_CANTRCVMORE) {
-		kn->kn_flags |= EV_EOF;
-		return (1);
-	} else {
-		kn->kn_flags &= ~EV_EOF;
-		return (kn->kn_data > 0);
-	}
-}
-
-static void
-filt_fifowdetach(struct knote *kn)
-{
-	struct socket *so = (struct socket *)kn->kn_hook;
-
-	SOCKBUF_LOCK(&so->so_snd);
-	knlist_remove(&so->so_snd.sb_sel.si_note, kn, 1);
-	if (knlist_empty(&so->so_snd.sb_sel.si_note))
-		so->so_snd.sb_flags &= ~SB_KNOTE;
-	SOCKBUF_UNLOCK(&so->so_snd);
-}
-
-static int
-filt_fifowrite(struct knote *kn, long hint)
-{
-	struct socket *so = (struct socket *)kn->kn_hook;
-
-	SOCKBUF_LOCK_ASSERT(&so->so_snd);
-	kn->kn_data = sbspace(&so->so_snd);
-	if (so->so_snd.sb_state & SBS_CANTSENDMORE) {
-		kn->kn_flags |= EV_EOF;
-		return (1);
-	} else {
-		kn->kn_flags &= ~EV_EOF;
-	        return (kn->kn_data >= so->so_snd.sb_lowat);
-	}
-}
-
-static void
-filt_fifodetach_notsup(struct knote *kn)
-{
-
-}
-
-static int
-filt_fifo_notsup(struct knote *kn, long hint)
-{
-
-	return (0);
-}
-
 /*
- * Device close routine
+ * Print out internel contents of a fifo vnode
  */
-/* ARGSUSED */
-static int
-fifo_close(ap)
-	struct vop_close_args /* {
-		struct vnode *a_vp;
-		int  a_fflag;
-		struct ucred *a_cred;
-		struct thread *a_td;
-	} */ *ap;
+int
+fifo_printinfo(struct vnode *vp)
 {
-	struct vnode *vp = ap->a_vp;
 	struct fifoinfo *fip = vp->v_fifoinfo;
 
-	ASSERT_VOP_ELOCKED(vp, "fifo_close");
 	if (fip == NULL) {
-		printf("fifo_close: no v_fifoinfo %p\n", vp);
-		return (0);
-	}
-	if (ap->a_fflag & FREAD) {
-		fip->fi_readers--;
-		if (fip->fi_readers == 0)
-			socantsendmore(fip->fi_writesock);
-	}
-	if (ap->a_fflag & FWRITE) {
-		fip->fi_writers--;
-		if (fip->fi_writers == 0)
-			socantrcvmore(fip->fi_readsock);
-	}
-	fifo_cleanup(vp);
-	return (0);
-}
-
-/*
- * Print out internal contents of a fifo vnode.
- */
-int
-fifo_printinfo(vp)
-	struct vnode *vp;
-{
-	register struct fifoinfo *fip = vp->v_fifoinfo;
-
-	if (fip == NULL){
 		printf(", NULL v_fifoinfo");
 		return (0);
 	}
 	printf(", fifo with %ld readers and %ld writers",
-		fip->fi_readers, fip->fi_writers);
+			fip->fi_readers, fip->fi_writers);
 	return (0);
 }
 
@@ -467,7 +266,7 @@
 		struct vnode *a_vp;
 	} */ *ap;
 {
-	printf("    ");
+	printf("	");
 	fifo_printinfo(ap->a_vp);
 	printf("\n");
 	return (0);
@@ -485,261 +284,90 @@
 	} */ *ap;
 {
 
-	switch (ap->a_name) {
-	case _PC_LINK_MAX:
-		*ap->a_retval = LINK_MAX;
-		return (0);
-	case _PC_PIPE_BUF:
-		*ap->a_retval = PIPE_BUF;
-		return (0);
-	case _PC_CHOWN_RESTRICTED:
-		*ap->a_retval = 1;
-		return (0);
-	default:
-		return (EINVAL);
-	}
-	/* NOTREACHED */
+	return (0);
 }
 
 /*
- * Fifo advisory byte-level locks.
+ * FIFO advisory byte-level locks.
  */
-/* ARGSUSED */
 static int
 fifo_advlock(ap)
 	struct vop_advlock_args /* {
 		struct vnode *a_vp;
-		caddr_t  a_id;
-		int  a_op;
+		caddr_t a_id;
+		int a_op;
 		struct flock *a_fl;
-		int  a_flags;
+		int a_flags;
 	} */ *ap;
 {
-
 	return (ap->a_flags & F_FLOCK ? EOPNOTSUPP : EINVAL);
 }
 
 static int
-fifo_close_f(struct file *fp, struct thread *td)
+fifo_read_f(struct file *fp, struct uio *uio, struct ucred *cred, int flags, struct thread *td)
 {
+	int error;
+	struct fifoinfo *fip = fp->f_data;
 
-	return (vnops.fo_close(fp, td));
+	fp->f_data = fip->fi_rpipe;
+	error = generic_pipe_read(fp, uio, cred, flags, td);
+	fp->f_data = fip;
+
+	return (error);
 }
 
-/*
- * The implementation of ioctl() for named fifos is complicated by the fact
- * that we permit O_RDWR fifo file descriptors, meaning that the actions of
- * ioctls may have to be applied to both the underlying sockets rather than
- * just one.  The original implementation simply forward the ioctl to one
- * or both sockets based on fp->f_flag.  We now consider each ioctl
- * separately, as the composition effect requires careful ordering.
- *
- * We do not blindly pass all ioctls through to the socket in order to avoid
- * providing unnecessary ioctls that might be improperly depended on by
- * applications (such as socket-specific, routing, and interface ioctls).
- *
- * Unlike sys_pipe.c, fifos do not implement the deprecated TIOCSPGRP and
- * TIOCGPGRP ioctls.  Earlier implementations of fifos did forward SIOCSPGRP
- * and SIOCGPGRP ioctls, so we might need to re-add those here.
- */
 static int
-fifo_ioctl_f(struct file *fp, u_long com, void *data, struct ucred *cred,
-    struct thread *td)
+fifo_write_f(struct file *fp, struct uio *uio, struct ucred *cred, int flags, struct thread *td)
 {
-	struct fifoinfo *fi;
-	struct file filetmp;	/* Local, so need not be locked. */
 	int error;
+	struct fifoinfo *fip = fp->f_data;
 
-	error = ENOTTY;
-	fi = fp->f_data;
+	fp->f_data = fip->fi_wpipe;
+	error = generic_pipe_write(fp, uio, cred, flags, td);
+	fp->f_data = fip;
 
-	switch (com) {
-	case FIONBIO:
-		/*
-		 * Non-blocking I/O is implemented at the fifo layer using
-		 * MSG_NBIO, so does not need to be forwarded down the stack.
-		 */
-		return (0);
-
-	case FIOASYNC:
-	case FIOSETOWN:
-	case FIOGETOWN:
-		/*
-		 * These socket ioctls don't have any ordering requirements,
-		 * so are called in an arbitrary order, and only on the
-		 * sockets indicated by the file descriptor rights.
-		 *
-		 * XXXRW: If O_RDWR and the read socket accepts an ioctl but
-		 * the write socket doesn't, the socketpair is left in an
-		 * inconsistent state.
-		 */
-		if (fp->f_flag & FREAD) {
-			filetmp.f_data = fi->fi_readsock;
-			filetmp.f_cred = cred;
-			error = soo_ioctl(&filetmp, com, data, cred, td);
-			if (error)
-				return (error);
-		}
-		if (fp->f_flag & FWRITE) {
-			filetmp.f_data = fi->fi_writesock;
-			filetmp.f_cred = cred;
-			error = soo_ioctl(&filetmp, com, data, cred, td);
-		}
-		return (error);
-
-	case FIONREAD:
-		/*
-		 * FIONREAD will return 0 for non-readable descriptors, and
-		 * the results of FIONREAD on the read socket for readable
-		 * descriptors.
-		 */
-		if (!(fp->f_flag & FREAD)) {
-			*(int *)data = 0;
-			return (0);
-		}
-		filetmp.f_data = fi->fi_readsock;
-		filetmp.f_cred = cred;
-		return (soo_ioctl(&filetmp, com, data, cred, td));
-
-	default:
-		return (ENOTTY);
-	}
+	return (error);
 }
 
-/*
- * Because fifos are now a file descriptor layer object, EVFILT_VNODE is not
- * implemented.  Likely, fifo_kqfilter() should be removed, and
- * fifo_kqfilter_f() should know how to forward the request to the underling
- * vnode using f_vnode in the file descriptor here.
- */
 static int
-fifo_kqfilter_f(struct file *fp, struct knote *kn)
+fifo_stat_f(struct file *fp, struct stat *sb, struct ucred *cred, struct thread *td)
 {
-	struct fifoinfo *fi;
-	struct socket *so;
-	struct sockbuf *sb;
 
-	fi = fp->f_data;
-
-	/*
-	 * If a filter is requested that is not supported by this file
-	 * descriptor, don't return an error, but also don't ever generate an
-	 * event.
-	 */
-	if ((kn->kn_filter == EVFILT_READ) && !(fp->f_flag & FREAD)) {
-		kn->kn_fop = &fifo_notsup_filtops;
-		return (0);
-	}
-
-	if ((kn->kn_filter == EVFILT_WRITE) && !(fp->f_flag & FWRITE)) {
-		kn->kn_fop = &fifo_notsup_filtops;
-		return (0);
-	}
-
-	switch (kn->kn_filter) {
-	case EVFILT_READ:
-		kn->kn_fop = &fiforead_filtops;
-		so = fi->fi_readsock;
-		sb = &so->so_rcv;
-		break;
-	case EVFILT_WRITE:
-		kn->kn_fop = &fifowrite_filtops;
-		so = fi->fi_writesock;
-		sb = &so->so_snd;
-		break;
-	default:
-		return (EINVAL);
-	}
-
-	kn->kn_hook = (caddr_t)so;
-
-	SOCKBUF_LOCK(sb);
-	knlist_add(&sb->sb_sel.si_note, kn, 1);
-	sb->sb_flags |= SB_KNOTE;
-	SOCKBUF_UNLOCK(sb);
-
-	return (0);
+	return (vnops.fo_stat(fp, sb, cred, td));
 }
 
 static int
-fifo_poll_f(struct file *fp, int events, struct ucred *cred, struct thread *td)
+fifo_truncate_f(struct file *fp, off_t length, struct ucred *cred, struct thread *td)
 {
-	struct fifoinfo *fip;
-	struct file filetmp;
-	int levents, revents = 0;
-
-	fip = fp->f_data;
-	levents = events &
-	    (POLLIN | POLLINIGNEOF | POLLPRI | POLLRDNORM | POLLRDBAND);
-	if ((fp->f_flag & FREAD) && levents) {
-		/*
-		 * If POLLIN or POLLRDNORM is requested and POLLINIGNEOF is
-		 * not, then convert the first two to the last one.  This
-		 * tells the socket poll function to ignore EOF so that we
-		 * block if there is no writer (and no data).  Callers can
-		 * set POLLINIGNEOF to get non-blocking behavior.
-		 */
-		if (levents & (POLLIN | POLLRDNORM) &&
-		    !(levents & POLLINIGNEOF)) {
-			levents &= ~(POLLIN | POLLRDNORM);
-			levents |= POLLINIGNEOF;
-		}
-
-		filetmp.f_data = fip->fi_readsock;
-		filetmp.f_cred = cred;
-		revents |= soo_poll(&filetmp, levents, cred, td);
-
-		/* Reverse the above conversion. */
-		if ((revents & POLLINIGNEOF) && !(events & POLLINIGNEOF)) {
-			revents |= (events & (POLLIN | POLLRDNORM));
-			revents &= ~POLLINIGNEOF;
-		}
-	}
-	levents = events & (POLLOUT | POLLWRNORM | POLLWRBAND);
-	if ((fp->f_flag & FWRITE) && levents) {
-		filetmp.f_data = fip->fi_writesock;
-		filetmp.f_cred = cred;
-		revents |= soo_poll(&filetmp, levents, cred, td);
-	}
-	return (revents);
+    
+	return (vnops.fo_truncate(fp, length, cred, td));
 }
 
 static int
-fifo_read_f(struct file *fp, struct uio *uio, struct ucred *cred, int flags, struct thread *td)
+fifo_close_f(struct file *fp, struct thread *td)
 {
-	struct fifoinfo *fip;
-	int sflags;
-
-	fip = fp->f_data;
-	KASSERT(uio->uio_rw == UIO_READ,("fifo_read mode"));
-	if (uio->uio_resid == 0)
-		return (0);
-	sflags = (fp->f_flag & FNONBLOCK) ? MSG_NBIO : 0;
-	return (soreceive(fip->fi_readsock, NULL, uio, NULL, NULL, &sflags));
+	return (vnops.fo_close(fp, td));
 }
 
 static int
-fifo_stat_f(struct file *fp, struct stat *sb, struct ucred *cred, struct thread *td)
+fifo_ioctl_f(struct file *fp, u_long com, void *data, struct ucred *cred, 
+	struct thread *td)
 {
 
-	return (vnops.fo_stat(fp, sb, cred, td));
+	return (0);
 }
 
 static int
-fifo_truncate_f(struct file *fp, off_t length, struct ucred *cred, struct thread *td)
+fifo_kqfilter_f(struct file *fp, struct knote *kn)
 {
 
-	return (vnops.fo_truncate(fp, length, cred, td));
+	return (0);
 }
 
-static int
-fifo_write_f(struct file *fp, struct uio *uio, struct ucred *cred, int flags, struct thread *td)
+static int 
+fifo_poll_f(struct file *fp, int events, struct ucred *cred, struct thread *td)
 {
-	struct fifoinfo *fip;
-	int sflags;
 
-	fip = fp->f_data;
-	KASSERT(uio->uio_rw == UIO_WRITE,("fifo_write mode"));
-	sflags = (fp->f_flag & FNONBLOCK) ? MSG_NBIO : 0;
-	return (sosend(fip->fi_writesock, NULL, uio, 0, NULL, sflags, td));
+	return (0);
 }
+


More information about the p4-projects mailing list