From owner-p4-projects@FreeBSD.ORG  Mon Sep 12 19:54:33 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5D18F16A421; Mon, 12 Sep 2005 19:54:33 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3307516A41F
	for <perforce@freebsd.org>; Mon, 12 Sep 2005 19:54:33 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D95DC43D46
	for <perforce@freebsd.org>; Mon, 12 Sep 2005 19:54:32 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j8CJsWjH074793
	for <perforce@freebsd.org>; Mon, 12 Sep 2005 19:54:32 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j8CJsWEO074790
	for perforce@freebsd.org; Mon, 12 Sep 2005 19:54:32 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 12 Sep 2005 19:54:32 GMT
Message-Id: <200509121954.j8CJsWEO074790@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 83496 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, 12 Sep 2005 19:54:34 -0000

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

Change 83496 by rwatson@rwatson_zoo on 2005/09/12 19:54:04

	Add a new "not supported" filter set for kqueue on fifos: when
	read is requested on a write-only descriptor, or write is requested
	on a read-only descriptor, permit registration (no error), but
	never raise the event.  That way, kqueue behavior matches poll and
	select.

Affected files ...

.. //depot/projects/netsmp/src/sys/fs/fifofs/fifo_vnops.c#7 edit

Differences ...

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

@@ -94,11 +94,15 @@
 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,
@@ -435,6 +439,19 @@
 	return (result);
 }
 
+static void
+filt_fifodetach_notsup(struct knote *kn)
+{
+
+}
+
+static int
+filt_fifo_notsup(struct knote *kn, long hint)
+{
+
+	return (0);
+}
+
 /*
  * Device close routine
  */
@@ -580,6 +597,22 @@
 	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;
@@ -685,4 +718,3 @@
 	error = sosend(fip->fi_writesock, NULL, uio, 0, NULL, sflags, td);
 	return (error);
 }
-