Changeset 11884

Timestamp:

03/17/05 16:04:25 (4 years ago)

Author:

bonefish

Message:

Added missing select()/deselect() Hooks to the file system interface
and made sure they are called by the VFS, if existent.

Location:

haiku/trunk

Files:

• headers/os/drivers/fs_interface.h (modified) (2 diffs)
• src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp (modified) (1 diff)
• src/kernel/core/fs/bootfs.c (modified) (1 diff)
• src/kernel/core/fs/devfs.cpp (modified) (2 diffs)
• src/kernel/core/fs/pipefs.cpp (modified) (2 diffs)
• src/kernel/core/fs/rootfs.c (modified) (1 diff)
• src/kernel/core/fs/vfs.cpp (modified) (3 diffs)

haiku/trunk/headers/os/drivers/fs_interface.h

@@ -18 +18 @@
 struct stat;
 struct fs_info;
+struct select_sync;
 
 typedef dev_t mount_id;
@@ -84 +85 @@
         status_t (*ioctl)(fs_volume fs, fs_vnode v, fs_cookie cookie, ulong op, void *buffer, size_t length);
         status_t (*set_flags)(fs_volume fs, fs_vnode v, fs_cookie cookie, int flags);
+        status_t (*select)(fs_volume fs, fs_vnode v, fs_cookie cookie, uint8 event,
+                                uint32 ref, selectsync *sync);
+        status_t (*deselect)(fs_volume fs, fs_vnode v, fs_cookie cookie,
+                                uint8 event, selectsync *sync);
         status_t (*fsync)(fs_volume fs, fs_vnode v);
 

haiku/trunk/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp

@@ -2028 +2028 @@
         &bfs_ioctl,
         &bfs_set_flags,
+        NULL,   // &bfs_select
+        NULL,   // &bfs_deselect
         &bfs_fsync,
 

haiku/trunk/src/kernel/core/fs/bootfs.c

@@ -980 +980 @@
         &bootfs_ioctl,
         NULL,   // set_flags
+        NULL,   // select
+        NULL,   // deselect
         &bootfs_fsync,
 

haiku/trunk/src/kernel/core/fs/devfs.cpp

@@ -1365 +1365 @@
 
 
+static status_t
+devfs_select(fs_volume _fs, fs_vnode _vnode, fs_cookie _cookie, uint8 event,
+        uint32 ref, selectsync *sync)
+{
+        struct devfs_vnode *vnode = (struct devfs_vnode *)_vnode;
+        struct devfs_cookie *cookie = (struct devfs_cookie *)_cookie;
+
+        if (!S_ISCHR(vnode->stream.type))
+                return B_NOT_ALLOWED;
+
+        // If the device has no select() hook, notify select() now.
+        if (!vnode->stream.u.dev.info->select)
+                return notify_select_event((selectsync*)sync, ref, event);
+
+        return vnode->stream.u.dev.info->select(cookie->u.dev.dcookie, event, ref,
+                (selectsync*)sync);
+}
+
+
+static status_t
+devfs_deselect(fs_volume _fs, fs_vnode _vnode, fs_cookie _cookie, uint8 event,
+        selectsync *sync)
+{
+        struct devfs_vnode *vnode = (struct devfs_vnode *)_vnode;
+        struct devfs_cookie *cookie = (struct devfs_cookie *)_cookie;
+
+        if (!S_ISCHR(vnode->stream.type))
+                return B_NOT_ALLOWED;
+
+        // If the device has no select() hook, notify select() now.
+        if (!vnode->stream.u.dev.info->deselect)
+                return B_OK;
+
+        return vnode->stream.u.dev.info->deselect(cookie->u.dev.dcookie, event,
+                (selectsync*)sync);
+}
+
+
 static bool
 devfs_can_page(fs_volume _fs, fs_vnode _vnode, fs_cookie cookie)
@@ -1546 +1584 @@
         &devfs_ioctl,
         &devfs_set_flags,
+        &devfs_select,
+        &devfs_deselect,
         &devfs_fsync,
 

haiku/trunk/src/kernel/core/fs/pipefs.cpp

@@ -1440 +1440 @@
 
 
+static status_t
+pipefs_select(fs_volume _fs, fs_vnode _vnode, fs_cookie _cookie, uint8 event,
+        uint32 ref, selectsync *sync)
+{
+        // ToDo: Implement!
+        return notify_select_event(sync, ref, event);
+}
+
+
+static status_t
+pipefs_deselect(fs_volume _fs, fs_vnode _vnode, fs_cookie _cookie, uint8 event,
+        selectsync *sync)
+{
+        // ToDo: Implement!
+        return B_OK;
+}
+
+
 static bool
 pipefs_can_page(fs_volume _volume, fs_vnode _v, fs_cookie cookie)
@@ -1588 +1606 @@
         &pipefs_ioctl,
         &pipefs_set_flags,
+        &pipefs_select,
+        &pipefs_deselect,
         &pipefs_fsync,
 

haiku/trunk/src/kernel/core/fs/rootfs.c

@@ -1057 +1057 @@
         &rootfs_ioctl,
         NULL,   // fs_set_flags()
+        NULL,   // select
+        NULL,   // deselect
         &rootfs_fsync,
 

haiku/trunk/src/kernel/core/fs/vfs.cpp

@@ -188 +188 @@
 static void file_free_fd(struct file_descriptor *);
 static status_t file_close(struct file_descriptor *);
+static status_t file_select(struct file_descriptor *, uint8 event, uint32 ref,
+        struct select_sync *sync);
+static status_t file_deselect(struct file_descriptor *, uint8 event,
+        struct select_sync *sync);
 static status_t dir_read(struct file_descriptor *, struct dirent *buffer, size_t bufferSize, uint32 *_count);
 static status_t dir_read(struct vnode *vnode, fs_cookie cookie, struct dirent *buffer, size_t bufferSize, uint32 *_count);
@@ -231 +235 @@
         file_seek,
         common_ioctl,
-        NULL,           // select()
-        NULL,           // deselect()
+        file_select,
+        file_deselect,
         NULL,           // read_dir()
         NULL,           // rewind_dir()
@@ -3150 +3154 @@
 
 static status_t
+file_select(struct file_descriptor *descriptor, uint8 event, uint32 ref,
+        struct select_sync *sync)
+{
+        FUNCTION(("file_select(%p, %u, %lu, %p)\n", descriptor, event, ref, sync));
+
+        struct vnode *vnode = descriptor->u.vnode;
+
+        // If the FS has no select() hook, notify select() now.
+        if (FS_CALL(vnode, select) == NULL)
+                return notify_select_event((selectsync*)sync, ref, event);
+
+        return FS_CALL(vnode, select)(vnode->mount->cookie, vnode->private_node,
+                descriptor->cookie, event, ref, (selectsync*)sync);
+}
+
+
+static status_t
+file_deselect(struct file_descriptor *descriptor, uint8 event,
+        struct select_sync *sync)
+{
+        struct vnode *vnode = descriptor->u.vnode;
+
+        if (FS_CALL(vnode, deselect) == NULL)
+                return B_OK;
+
+        return FS_CALL(vnode, deselect)(vnode->mount->cookie, vnode->private_node,
+                descriptor->cookie, event, (selectsync*)sync);
+}
+
+
+static status_t
 dir_create_entry_ref(mount_id mountID, vnode_id parentID, const char *name, int perms, bool kernel)
 {