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

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>

diff --git a/lib/thread.c b/lib/thread.c
index 90c794e88dc8ac1c828824c3d18d74c2066fe206..6669952ff43a5b5a5f5c2f298ef416cf697728e6 100644 (file)
--- a/lib/thread.c
+++ b/lib/thread.c
@@ -975,6 +975,8 @@ static void thread_cancel_rw(struct thread_master *master, int fd, short state)
                        (master->handler.pfdcount - i - 1)
                                * sizeof(struct pollfd));
                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,
@@ -989,6 +991,8 @@ static void thread_cancel_rw(struct thread_master *master, int fd, short state)
                        (master->handler.copycount - i - 1)
                                * sizeof(struct pollfd));
                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)
                                        * sizeof(struct pollfd));
                        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,
                                (m->handler.copycount - i - 1)
                                        * sizeof(struct pollfd));
                        m->handler.copycount--;
+                       m->handler.copy[m->handler.copycount].fd = 0;
+                       m->handler.copy[m->handler.copycount].events = 0;
 
                        i--;
                }