Module Name: src
Committed By: pho
Date: Sat Jan 22 07:56:16 UTC 2022
Modified Files:
src/distrib/sets/lists/comp: mi
src/lib/librefuse: TODO fuse.h
src/lib/librefuse/refuse: Makefile.inc
Added Files:
src/lib/librefuse/refuse: poll.c poll.h
Log Message:
lib/librefuse: Add stub functions for FUSE polling API
To generate a diff of this commit:
cvs rdiff -u -r1.2406 -r1.2407 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.5 -r1.6 src/lib/librefuse/TODO
cvs rdiff -u -r1.26 -r1.27 src/lib/librefuse/fuse.h
cvs rdiff -u -r1.2 -r1.3 src/lib/librefuse/refuse/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/lib/librefuse/refuse/poll.c \
src/lib/librefuse/refuse/poll.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2406 src/distrib/sets/lists/comp/mi:1.2407
--- src/distrib/sets/lists/comp/mi:1.2406 Sat Jan 22 07:54:56 2022
+++ src/distrib/sets/lists/comp/mi Sat Jan 22 07:56:15 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2406 2022/01/22 07:54:56 pho Exp $
+# $NetBSD: mi,v 1.2407 2022/01/22 07:56:15 pho Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -3093,6 +3093,7 @@
./usr/include/readline/history.h comp-c-include
./usr/include/readline/readline.h comp-c-include
./usr/include/refuse/buf.h comp-refuse-include
+./usr/include/refuse/poll.h comp-refuse-include
./usr/include/refuse/session.h comp-refuse-include
./usr/include/regex.h comp-c-include
./usr/include/regexp.h comp-c-include
Index: src/lib/librefuse/TODO
diff -u src/lib/librefuse/TODO:1.5 src/lib/librefuse/TODO:1.6
--- src/lib/librefuse/TODO:1.5 Sat Jan 22 07:54:57 2022
+++ src/lib/librefuse/TODO Sat Jan 22 07:56:16 2022
@@ -1,4 +1,4 @@
- $NetBSD: TODO,v 1.5 2022/01/22 07:54:57 pho Exp $
+ $NetBSD: TODO,v 1.6 2022/01/22 07:56:16 pho Exp $
To Do
=====
@@ -11,6 +11,7 @@ implement all sorts of compat tweaks to
do proper implementations of dirfillers
statfs - some fuse file systems want struct statfs and we only have
statvfs available natively
+Support polling appeared on FUSE 2.8 (struct fuse_pollhandle).
Support data buffers appeared on FUSE 2.9 (struct fuse_buf).
Done
Index: src/lib/librefuse/fuse.h
diff -u src/lib/librefuse/fuse.h:1.26 src/lib/librefuse/fuse.h:1.27
--- src/lib/librefuse/fuse.h:1.26 Sat Jan 22 07:54:57 2022
+++ src/lib/librefuse/fuse.h Sat Jan 22 07:56:16 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fuse.h,v 1.26 2022/01/22 07:54:57 pho Exp $ */
+/* $NetBSD: fuse.h,v 1.27 2022/01/22 07:56:16 pho Exp $ */
/*
* Copyright © 2007 Alistair Crooks. All rights reserved.
@@ -31,6 +31,7 @@
#define FUSE_H_ 20211204
#include <refuse/buf.h>
+#include <refuse/poll.h>
#include <refuse/session.h>
#include <sys/cdefs.h>
#include <sys/stat.h>
Index: src/lib/librefuse/refuse/Makefile.inc
diff -u src/lib/librefuse/refuse/Makefile.inc:1.2 src/lib/librefuse/refuse/Makefile.inc:1.3
--- src/lib/librefuse/refuse/Makefile.inc:1.2 Sat Jan 22 07:54:57 2022
+++ src/lib/librefuse/refuse/Makefile.inc Sat Jan 22 07:56:16 2022
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile.inc,v 1.2 2022/01/22 07:54:57 pho Exp $
+# $NetBSD: Makefile.inc,v 1.3 2022/01/22 07:56:16 pho Exp $
.PATH: ${.CURDIR}/refuse
SRCS+= buf.c
+SRCS+= poll.c
SRCS+= session.c
INCS+= refuse/buf.h
+INCS+= refuse/poll.h
INCS+= refuse/session.h
Added files:
Index: src/lib/librefuse/refuse/poll.c
diff -u /dev/null src/lib/librefuse/refuse/poll.c:1.1
--- /dev/null Sat Jan 22 07:56:16 2022
+++ src/lib/librefuse/refuse/poll.c Sat Jan 22 07:56:16 2022
@@ -0,0 +1,51 @@
+/* $NetBSD: poll.c,v 1.1 2022/01/22 07:56:16 pho Exp $ */
+
+/*
+ * Copyright (c) 2021 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ * products derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+#if !defined(lint)
+__RCSID("$NetBSD: poll.c,v 1.1 2022/01/22 07:56:16 pho Exp $");
+#endif /* !lint */
+
+#include <fuse_internal.h>
+
+/* XXX: ReFUSE doesn't support polling at the moment. It doesn't
+ * implement puffs_node_poll(), and will never invoke
+ * fuse_operations.poll(). So there is no valid way for a FUSE
+ * filesystem to actually call these functions. */
+
+int
+fuse_notify_poll(struct fuse_pollhandle *ph) {
+ return 0;
+}
+
+void
+fuse_pollhandle_destroy(struct fuse_pollhandle *ph) {
+}
Index: src/lib/librefuse/refuse/poll.h
diff -u /dev/null src/lib/librefuse/refuse/poll.h:1.1
--- /dev/null Sat Jan 22 07:56:16 2022
+++ src/lib/librefuse/refuse/poll.h Sat Jan 22 07:56:16 2022
@@ -0,0 +1,57 @@
+/* $NetBSD: poll.h,v 1.1 2022/01/22 07:56:16 pho Exp $ */
+
+/*
+ * Copyright (c) 2021 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ * products derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#if !defined(_FUSE_POLL_H_)
+#define _FUSE_POLL_H_
+
+/* Polling API, appeared on FUSE 2.8 */
+
+#if !defined(FUSE_H_)
+# error Do not include this header directly. Include <fuse.h> instead.
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* A private structure for polling, appeared on FUSE 2.8. */
+struct fuse_pollhandle;
+
+/* Notify the kernel of an IO readiness event. Appeared on FUSE 2.8. */
+int fuse_notify_poll(struct fuse_pollhandle *ph);
+
+/* Destroy a poll handle. Appeared on FUSE 2.8. */
+void fuse_pollhandle_destroy(struct fuse_pollhandle *ph);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
