From owner-p4-projects@FreeBSD.ORG  Mon Jun  8 13:05:05 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6D7DE106568F; Mon,  8 Jun 2009 13:05:05 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1B92D1065680
	for <perforce@FreeBSD.org>; Mon,  8 Jun 2009 13:05:05 +0000 (UTC)
	(envelope-from zhaoshuai@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 03E5F8FC25
	for <perforce@FreeBSD.org>; Mon,  8 Jun 2009 13:05:05 +0000 (UTC)
	(envelope-from zhaoshuai@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n58D54J4036526
	for <perforce@FreeBSD.org>; Mon, 8 Jun 2009 13:05:04 GMT
	(envelope-from zhaoshuai@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n58D54Tv036524
	for perforce@freebsd.org; Mon, 8 Jun 2009 13:05:04 GMT
	(envelope-from zhaoshuai@FreeBSD.org)
Date: Mon, 8 Jun 2009 13:05:04 GMT
Message-Id: <200906081305.n58D54Tv036524@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zhaoshuai@FreeBSD.org using -f
From: Zhao Shuai <zhaoshuai@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 163779 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jun 2009 13:05:06 -0000

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

Change 163779 by zhaoshuai@zhaoshuai on 2009/06/08 13:04:22

	add fifo_poll_f()

Affected files ...

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

Differences ...

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

@@ -43,6 +43,7 @@
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
+#include <sys/poll.h>
 #include <sys/stat.h>
 #include <sys/unistd.h>
 #include <sys/vnode.h>
@@ -491,7 +492,15 @@
 static int 
 fifo_poll_f(struct file *fp, int events, struct ucred *cred, struct thread *td)
 {
+	struct fifoinfo *fip = fp->f_data;
+	int levents, revents = 0;
 
-	return (0);
+	levents = events & (POLLIN | POLLRDNORM);
+	if ((fp->f_flag & FREAD) && levents) 
+		revents |= generic_pipe_poll(fip->fi_rpipe, levents, cred, td);
+	levents = events & (POLLOUT | POLLWRNORM);
+	if ((fp->f_flag & FWRITE) && levents)
+		revents |= generic_pipe_poll(fip->fi_wpipe, levents, cred, td);
+	return (revents);
 }