From: Martin Mares <mj@ucw.cz>
Date: Sun, 27 Feb 2011 10:57:13 +0000 (+0100)
Subject: Main: file_recalc_list need not be empty upon main_destroy()
X-Git-Tag: v5.0~129^2~3
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=e846601463c9b20b012cd4fdbd47b5b27cd2e16c;p=libucw.git

Main: file_recalc_list need not be empty upon main_destroy()
---

diff --git a/ucw/mainloop.c b/ucw/mainloop.c
index 03cff677..ca296bbd 100644
--- a/ucw/mainloop.c
+++ b/ucw/mainloop.c
@@ -124,7 +124,6 @@ main_prepare_delete(struct main_context *m)
 
   // Close epoll descriptor early enough, it might be shared after fork!
 #ifdef CONFIG_UCW_EPOLL
-  ASSERT(clist_empty(&m->file_recalc_list));
   xfree(m->epoll_events);
   close(m->epoll_fd);
   m->epoll_fd = -1;
@@ -166,6 +165,9 @@ main_delete(struct main_context *m)
   main_prepare_delete(m);
   ASSERT(clist_empty(&m->file_list));
   ASSERT(clist_empty(&m->file_active_list));
+#ifdef CONFIG_UCW_EPOLL
+  ASSERT(clist_empty(&m->file_recalc_list));
+#endif
   ASSERT(clist_empty(&m->hook_list));
   ASSERT(clist_empty(&m->hook_done_list));
   ASSERT(clist_empty(&m->process_list));