mirror of
https://github.com/Mathewnd/Astral.git
synced 2026-10-28 21:28:21 +00:00
vfs: use iovec_iterator for all file read and write, add vfs_read_iovec and vfs_write_iovec
This commit is contained in:
@@ -55,8 +55,10 @@ syscallret_t syscall_recvmsg(context_t *, int fd, msghdr_t *umsghdr, int flags)
|
||||
if (flags & MSG_WAITALL)
|
||||
recvflags |= SOCKET_RECV_FLAGS_WAITALL;
|
||||
|
||||
iovec_iterator_t iovec_iterator;
|
||||
sockdesc_t desc = {
|
||||
.addr = &sockaddr,
|
||||
.iovec_iterator = &iovec_iterator,
|
||||
.count = buffersize,
|
||||
.flags = fileflagstovnodeflags(file->flags) | recvflags,
|
||||
.donecount = 0,
|
||||
@@ -65,7 +67,7 @@ syscallret_t syscall_recvmsg(context_t *, int fd, msghdr_t *umsghdr, int flags)
|
||||
.ctrldone = 0
|
||||
};
|
||||
|
||||
iovec_iterator_init(&desc.iovec_iterator, msghdr.iov, msghdr.iovcount);
|
||||
iovec_iterator_init(desc.iovec_iterator, msghdr.iov, msghdr.iovcount);
|
||||
|
||||
ret.errno = socket->ops->recv(socket, &desc);
|
||||
if (ret.errno)
|
||||
|
||||
@@ -49,8 +49,10 @@ syscallret_t syscall_sendmsg(context_t *, int fd, msghdr_t *umsghdr, int flags)
|
||||
|
||||
socket_t *socket = SOCKFS_SOCKET_FROM_NODE(file->vnode);
|
||||
|
||||
iovec_iterator_t iovec_iterator;
|
||||
sockdesc_t desc = {
|
||||
.addr = msghdr.addr ? &sockaddr : NULL,
|
||||
.iovec_iterator = &iovec_iterator,
|
||||
.count = buffersize,
|
||||
.flags = fileflagstovnodeflags(file->flags) | ((flags & MSG_NOSIGNAL) ? SOCKET_SEND_FLAGS_NOSIGNAL : 0),
|
||||
.donecount = 0,
|
||||
@@ -59,7 +61,7 @@ syscallret_t syscall_sendmsg(context_t *, int fd, msghdr_t *umsghdr, int flags)
|
||||
.ctrldone = 0
|
||||
};
|
||||
|
||||
iovec_iterator_init(&desc.iovec_iterator, msghdr.iov, msghdr.iovcount);
|
||||
iovec_iterator_init(desc.iovec_iterator, msghdr.iov, msghdr.iovcount);
|
||||
|
||||
ret.errno = socket->ops->send(socket, &desc);
|
||||
ret.ret = ret.errno ? -1 : desc.donecount;
|
||||
|
||||
Reference in New Issue
Block a user