sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fs/epoll: Reuse fd returned from epoll for internal signaling

Browse Source 
to avoid the usage of nuttx special extension(POLLFILE)

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2022-11-06 05:16:03 +08:00 committed by Petro Karashchenko
parent 3f3b5ab75e
commit 7e8e5c10d1
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fs/vfs/fs_epoll.c
View File

@ -50,8 +50,6 @@ struct epoll_head
int occupied;
int crefs;
mutex_t lock;
struct file fp;
struct inode in;
FAR epoll_data_t *data;
FAR struct pollfd *poll;
};
@ -190,14 +188,6 @@ static int epoll_do_create(int size, int flags)
eph->data = (FAR epoll_data_t *)(eph + 1);
eph->poll = (FAR struct pollfd *)(eph->data + reserve);
INODE_SET_DRIVER(&eph->in);
eph->in.u.i_ops = &g_epoll_ops;
eph->fp.f_inode = &eph->in;
eph->in.i_private = eph;
eph->poll[0].ptr = &eph->fp;
eph->poll[0].events = POLLIN | POLLFILE;
/* Alloc the file descriptor */
fd = file_allocate(&g_epoll_inode, flags, 0, eph, 0, true);
@ -209,6 +199,11 @@ static int epoll_do_create(int size, int flags)
return ERROR;
}
/* Setup the first pollfd for internal use */
eph->poll[0].fd = fd;
eph->poll[0].events = POLLIN;
return fd;
}