nortti/sortix-mirror
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Allow poll on all kinds of files.

Browse source
This commit is contained in:
Jonas 'Sortie' Termansen 2021-02-16 22:19:50 +01:00
parent fb106181a9
commit a6295e6d90
2 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
kernel/fs/user.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2012, 2013, 2014, 2015, 2016, 2017 Jonas 'Sortie' Termansen. * Copyright (c) 2012-2017, 2021 Jonas 'Sortie' Termansen.
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -43,6 +43,7 @@
#include <sortix/kernel/kernel.h> #include <sortix/kernel/kernel.h>
#include <sortix/kernel/kthread.h> #include <sortix/kernel/kthread.h>
#include <sortix/kernel/mtable.h> #include <sortix/kernel/mtable.h>
#include <sortix/kernel/poll.h>
#include <sortix/kernel/process.h> #include <sortix/kernel/process.h>
#include <sortix/kernel/refcount.h> #include <sortix/kernel/refcount.h>
#include <sortix/kernel/scheduler.h> #include <sortix/kernel/scheduler.h>
@ -1444,9 +1445,13 @@ int Unode::gettermmode(ioctx_t* ctx, unsigned* mode)
return ret; return ret;
} }
int Unode::poll(ioctx_t* /*ctx*/, PollNode* /*node*/) int Unode::poll(ioctx_t* /*ctx*/, PollNode* node)
{ {
return errno = ENOTSUP, -1; short status = POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM;
if ( !(status & node->events) )
return errno = EAGAIN, -1;
node->master->revents |= status & node->events;
return 0;
} }
int Unode::rename_here(ioctx_t* ctx, Ref<Inode> from, const char* oldname, int Unode::rename_here(ioctx_t* ctx, Ref<Inode> from, const char* oldname,

22
kernel/inode.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2012, 2013, 2014, 2015, 2016, 2017 Jonas 'Sortie' Termansen. * Copyright (c) 2012-2017, 2021 Jonas 'Sortie' Termansen.
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -22,6 +22,7 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <limits.h> #include <limits.h>
#include <poll.h>
#include <string.h> #include <string.h>
#include <sortix/clock.h> #include <sortix/clock.h>
@ -34,6 +35,7 @@
#include <sortix/kernel/kernel.h> #include <sortix/kernel/kernel.h>
#include <sortix/kernel/kthread.h> #include <sortix/kernel/kthread.h>
#include <sortix/kernel/memorymanagement.h> #include <sortix/kernel/memorymanagement.h>
#include <sortix/kernel/poll.h>
#include <sortix/kernel/refcount.h> #include <sortix/kernel/refcount.h>
#include <sortix/kernel/time.h> #include <sortix/kernel/time.h>
@ -488,19 +490,13 @@ int AbstractInode::gettermmode(ioctx_t* /*ctx*/, unsigned* /*mode*/)
return errno = ENOTTY, -1; return errno = ENOTTY, -1;
} }
int AbstractInode::poll(ioctx_t* /*ctx*/, PollNode* /*node*/) int AbstractInode::poll(ioctx_t* /*ctx*/, PollNode* node)
{ {
#if 0 // TODO: Support poll on regular files as per POSIX. short status = POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM;
if ( inode_type == INODE_TYPE_FILE ) if ( !(status & node->events) )
{ return errno = EAGAIN, -1;
// TODO: Correct bits? node->master->revents |= status & node->events;
if ( !((POLLIN | POLLOUT) & node->events) ) return 0;
return errno = EAGAIN, -1;
node->master->revents |= (POLLIN | POLLOUT) & node->events;
return 0;
}
#endif
return errno = ENOTSUP, -1;
} }
int AbstractInode::rename_here(ioctx_t* /*ctx*/, Ref<Inode> /*from*/, int AbstractInode::rename_here(ioctx_t* /*ctx*/, Ref<Inode> /*from*/,