[CRIU] [PATCH 1/5] util: epoll: move comment about timeout decrease to uffd.c
Mike Rapoport
rppt at linux.vnet.ibm.com
Wed Nov 22 22:37:08 MSK 2017
The generic epoll_wait wrapper should not do any assumptions about timeout.
It's it up to lazy-pages daemon to make (future) policy decisions.
Signed-off-by: Mike Rapoport <rppt at linux.vnet.ibm.com>
---
criu/uffd.c | 1 +
criu/util.c | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/criu/uffd.c b/criu/uffd.c
index 93ba0d6..ee6d2b9 100644
--- a/criu/uffd.c
+++ b/criu/uffd.c
@@ -1105,6 +1105,7 @@ static void lazy_pages_summary(struct lazy_pages_info *lpi)
static int handle_requests(int epollfd, struct epoll_event *events, int nr_fds)
{
struct lazy_pages_info *lpi, *n;
+ /* FIXME -- timeout should decrease over time... */
int poll_timeout = POLL_TIMEOUT;
int ret;
diff --git a/criu/util.c b/criu/util.c
index 28fc804..2bd56f6 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -1350,7 +1350,6 @@ int epoll_run_rfds(int epollfd, struct epoll_event *evs, int nr_fds, int timeout
bool have_a_break = false;
while (1) {
- /* FIXME -- timeout should decrease over time... */
ret = epoll_wait(epollfd, evs, nr_fds, timeout);
if (ret <= 0) {
if (ret < 0)
--
2.7.4
More information about the CRIU
mailing list