ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-05-31 06:31:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libc: support for O_NONBLOCK in read()

Browse Source
This commit is contained in:
Christian Helmuth 2017-04-07 14:02:40 +02:00
parent f7313e841d
commit b3819f30dc
1 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
repos/libports/src/lib/libc/vfs_plugin.cc
View File

@ -130,6 +130,30 @@ namespace Libc {
static Config_attr socket("socket", ""); static Config_attr socket("socket", "");
return socket.string(); return socket.string();
} }
void notify_read_ready(Vfs::Vfs_handle *handle)
{
struct Check : Libc::Suspend_functor
{
Vfs::Vfs_handle *handle;
Check(Vfs::Vfs_handle *handle) : handle(handle) { }
bool suspend() override { return !handle->fs().notify_read_ready(handle); }
} check(handle);
while (!handle->fs().notify_read_ready(handle))
Libc::suspend(check);
}
bool read_ready(Libc::File_descriptor *fd)
{
Vfs::Vfs_handle *handle = vfs_handle(fd);
if (!handle) return false;
notify_read_ready(handle);
return handle->fs().read_ready(handle);
}
} }
int Libc::Vfs_plugin::access(const char *path, int amode) int Libc::Vfs_plugin::access(const char *path, int amode)
@ -326,6 +350,9 @@ ssize_t Libc::Vfs_plugin::read(Libc::File_descriptor *fd, void *buf,
Vfs::file_size out_count = 0; Vfs::file_size out_count = 0;
Result out_result = Result::READ_OK; Result out_result = Result::READ_OK;
if (fd->flags & O_NONBLOCK && !Libc::read_ready(fd))
return Errno(EAGAIN);
while (!handle->fs().queue_read(handle, (char *)buf, count, while (!handle->fs().queue_read(handle, (char *)buf, count,
out_result, out_count)) { out_result, out_count)) {
struct Check : Read_check { struct Check : Read_check {
@ -839,15 +866,7 @@ int Libc::Vfs_plugin::select(int nfds,
FD_SET(fd, readfds); FD_SET(fd, readfds);
++nready; ++nready;
} else { } else {
struct Check : Libc::Suspend_functor { Libc::notify_read_ready(handle);
Vfs::Vfs_handle * handle;
Check(Vfs::Vfs_handle * handle) : handle (handle) { }
bool suspend() override {
return !handle->fs().notify_read_ready(handle); }
} check ( handle );
while (!handle->fs().notify_read_ready(handle))
Libc::suspend(check);
} }
} }
@ -862,17 +881,3 @@ int Libc::Vfs_plugin::select(int nfds,
} }
return nready; return nready;
} }
namespace Libc {
bool read_ready(Libc::File_descriptor *fd)
{
Vfs::Vfs_handle *handle = vfs_handle(fd);
if (!handle) return false;
handle->fs().notify_read_ready(handle);
return handle->fs().read_ready(handle);
}
}