mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-10-27 20:58:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

vfs: use iovec_iterator for all file read and write, add vfs_read_iovec and vfs_write_iovec

Browse Source
This commit is contained in:
Matheus
2024-09-21 16:56:43 -03:00
parent e8c2f1fbf3
commit f1ee575ed1
13 changed files with 167 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/include/kernel/sock.h
+9 -3
View File
@@ -39,7 +39,7 @@ typedef struct {
typedef struct {
sockaddr_t *addr;
iovec_iterator_t iovec_iterator;
iovec_iterator_t *iovec_iterator;
size_t count;
uintmax_t flags;
size_t donecount;
@@ -80,8 +80,11 @@ typedef struct {
#define SOCKFS_SOCKET_FROM_NODE(nodep) (((socketnode_t *)(nodep))->socket)
static inline int socket_read(socket_t *socket, void *buffer, size_t size, uintmax_t flags, size_t *bytes_read) {
iovec_iterator_t iovec_iterator;
sockdesc_t desc = {
.addr = NULL,
.iovec_iterator = &iovec_iterator,
.count = size,
.flags = flags,
.donecount = 0,
@@ -94,7 +97,7 @@ static inline int socket_read(socket_t *socket, void *buffer, size_t size, uintm
.len = size
};
iovec_iterator_init(&desc.iovec_iterator, &iovec, 1);
iovec_iterator_init(desc.iovec_iterator, &iovec, 1);
int e = socket->ops->recv(socket, &desc);
@@ -104,8 +107,11 @@ static inline int socket_read(socket_t *socket, void *buffer, size_t size, uintm
}
static inline int socket_write(socket_t *socket, void *buffer, size_t size, uintmax_t flags, size_t *bytes_written) {
iovec_iterator_t iovec_iterator;
sockdesc_t desc = {
.addr = NULL,
.iovec_iterator = &iovec_iterator,
.count = size,
.flags = flags,
.donecount = 0,
@@ -118,7 +124,7 @@ static inline int socket_write(socket_t *socket, void *buffer, size_t size, uint
.len = size
};
iovec_iterator_init(&desc.iovec_iterator, &iovec, 1);
iovec_iterator_init(desc.iovec_iterator, &iovec, 1);
int e = socket->ops->send(socket, &desc);
kernel-src/include/kernel/vfs.h
+4 -2
View File
@@ -118,8 +118,8 @@ struct polldata;
typedef struct vops_t {
int (*open)(vnode_t **node, int flags, cred_t *cred);
int (*close)(vnode_t *node, int flags, cred_t *cred);
int (*read)(vnode_t *node, void *buffer, size_t size, uintmax_t offset, int flags, size_t *readc, cred_t *cred);
int (*write)(vnode_t *node, void *buffer, size_t size, uintmax_t offset, int flags, size_t *writec, cred_t *cred);
int (*read)(vnode_t *node, iovec_iterator_t *iovec_iterator, size_t size, uintmax_t offset, int flags, size_t *readc, cred_t *cred);
int (*write)(vnode_t *node, iovec_iterator_t *iovec_iterator, size_t size, uintmax_t offset, int flags, size_t *writec, cred_t *cred);
int (*lookup)(vnode_t *node, char *name, vnode_t **result, cred_t *cred);
int (*create)(vnode_t *parent, char *name, vattr_t *attr, int type, vnode_t **result, cred_t *cred);
int (*getattr)(vnode_t *node, vattr_t *attr, cred_t *cred);
@@ -214,6 +214,8 @@ int vfs_register(vfsops_t *vfsops, char *name);
int vfs_open(vnode_t *ref, char *path, int flags, vnode_t **result);
int vfs_close(vnode_t *node, int flags);
int vfs_write_iovec(vnode_t *node, iovec_iterator_t *iovec_iterator, size_t size, uintmax_t offset, size_t *written, int flags);
int vfs_read_iovec(vnode_t *node, iovec_iterator_t *iovec_iterator, size_t size, uintmax_t offset, size_t *bytesread, int flags);
int vfs_write(vnode_t *node, void *buffer, size_t size, uintmax_t offset, size_t *written, int flags);
int vfs_read(vnode_t *node, void *buffer, size_t size, uintmax_t offset, size_t *bytesread, int flags);
int vfs_create(vnode_t *ref, char *path, vattr_t *attr, int type, vnode_t **node);