proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 09:22:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: Clean up the index that is being used for storing FD and events.

Browse Source 
When POLLNVAL is received for a FD then that FD is removed from the
pfd array and also array is rearranged using memmove. When memmove
is used then unused index are not cleanedup. When a new FD takes
up that index then it ends up using stale events without any handler
set for the same.

Signed-off-by: Santosh P K <sapk@vmware.com>
This commit is contained in:
Spantik 2019-10-14 05:17:29 -07:00
parent d563896dad
commit e985cda017
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/thread.c
View File

@ -975,6 +975,8 @@ static void thread_cancel_rw(struct thread_master *master, int fd, short state)
(master->handler.pfdcount - i - 1) (master->handler.pfdcount - i - 1)
* sizeof(struct pollfd)); * sizeof(struct pollfd));
master->handler.pfdcount--; master->handler.pfdcount--;
master->handler.pfds[master->handler.pfdcount].fd = 0;
master->handler.pfds[master->handler.pfdcount].events = 0;
} }
/* If we have the same pollfd in the copy, perform the same operations, /* If we have the same pollfd in the copy, perform the same operations,
@ -989,6 +991,8 @@ static void thread_cancel_rw(struct thread_master *master, int fd, short state)
(master->handler.copycount - i - 1) (master->handler.copycount - i - 1)
* sizeof(struct pollfd)); * sizeof(struct pollfd));
master->handler.copycount--; master->handler.copycount--;
master->handler.copy[master->handler.copycount].fd = 0;
master->handler.copy[master->handler.copycount].events = 0;
} }
} }
@ -1292,11 +1296,15 @@ static void thread_process_io(struct thread_master *m, unsigned int num)
(m->handler.pfdcount - i - 1) (m->handler.pfdcount - i - 1)
* sizeof(struct pollfd)); * sizeof(struct pollfd));
m->handler.pfdcount--; m->handler.pfdcount--;
m->handler.pfds[m->handler.pfdcount].fd = 0;
m->handler.pfds[m->handler.pfdcount].events = 0;
memmove(pfds + i, pfds + i + 1, memmove(pfds + i, pfds + i + 1,
(m->handler.copycount - i - 1) (m->handler.copycount - i - 1)
* sizeof(struct pollfd)); * sizeof(struct pollfd));
m->handler.copycount--; m->handler.copycount--;
m->handler.copy[m->handler.copycount].fd = 0;
m->handler.copy[m->handler.copycount].events = 0;
i--; i--;
} }