Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions include/silk/fibers/fiber.h
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ class FiberScheduler
#if defined(__SANITIZE_MEMORY__)
// Used to mark the kernel-written bytes as initialized for MSan.
iovec * readIov = nullptr;
uint64_t readIovLen = 0;
uint32_t readIovLen = 0;
#endif
};

Expand Down Expand Up @@ -387,7 +387,7 @@ class FiberScheduler
* @param bytesRead If not null, receives the number of bytes read on success.
* @param future Completion handle; wait() returns 0 on success or a errno on failure.
*/
static void read(int fd, iovec * iov, uint64_t iov_len, uint64_t offset, uint64_t * bytesRead, IoFuture * future) noexcept;
static void read(int fd, iovec * iov, uint32_t iov_len, uint64_t offset, uint64_t * bytesRead, IoFuture * future) noexcept;

/**
* Blocking write: submit a write from @p buf and suspend the calling fiber
Expand Down Expand Up @@ -419,7 +419,7 @@ class FiberScheduler
* @param bytesWritten If not null, receives the number of bytes written on success.
* @param future Completion handle; wait() returns 0 on success or a errno on failure.
*/
static void write(int fd, iovec * iov, uint64_t iov_len, uint64_t offset, uint64_t * bytesWritten, IoFuture * future) noexcept;
static void write(int fd, iovec * iov, uint32_t iov_len, uint64_t offset, uint64_t * bytesWritten, IoFuture * future) noexcept;

/**
* Blocking poll: suspend the calling fiber until one of the requested
Expand Down
6 changes: 3 additions & 3 deletions src/fibers/fiber.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1421,7 +1421,7 @@ void FiberScheduler::enqueueIo(IoFuture * future, Setup && setup) noexcept
}
}

void FiberScheduler::read(int fd, iovec * iov, uint64_t iov_len, uint64_t offset, uint64_t * bytesRead, IoFuture * future) noexcept
void FiberScheduler::read(int fd, iovec * iov, uint32_t iov_len, uint64_t offset, uint64_t * bytesRead, IoFuture * future) noexcept
{
future->result = bytesRead;
#if defined(__SANITIZE_MEMORY__)
Expand All @@ -1431,7 +1431,7 @@ void FiberScheduler::read(int fd, iovec * iov, uint64_t iov_len, uint64_t offset
enqueueIo(future, [=](io_uring_sqe * sqe) noexcept { ::io_uring_prep_readv(sqe, fd, iov, iov_len, offset); });
}

void FiberScheduler::write(int fd, iovec * iov, uint64_t iov_len, uint64_t offset, uint64_t * bytesWritten, IoFuture * future) noexcept
void FiberScheduler::write(int fd, iovec * iov, uint32_t iov_len, uint64_t offset, uint64_t * bytesWritten, IoFuture * future) noexcept
{
future->result = bytesWritten;
enqueueIo(future, [=](io_uring_sqe * sqe) noexcept { ::io_uring_prep_writev(sqe, fd, iov, iov_len, offset); });
Expand Down Expand Up @@ -1808,7 +1808,7 @@ __attribute__((noinline)) bool FiberScheduler::handleCompletionQueueSlow(Process
#if defined(__SANITIZE_MEMORY__)
// MSan cannot see the kernel filling read buffers via io_uring.
uint64_t remaining = static_cast<uint64_t>(result);
for (uint64_t i = 0; i < future->readIovLen && remaining > 0; ++i)
for (uint32_t i = 0; i < future->readIovLen && remaining > 0; ++i)
{
const uint64_t n = std::min<uint64_t>(remaining, future->readIov[i].iov_len);
MSAN_UNPOISON(future->readIov[i].iov_base, n);
Expand Down
Loading