mainloop: Small fixes in hooks.

diff --git a/ucw/mainloop.c b/ucw/mainloop.c
index 06db44ff8ada38ad79f74de0f2d10f97f91e65a1..4138aae1ec237aa42d79d90a56f6833f901b42b4 100644 (file)
--- a/ucw/mainloop.c
+++ b/ucw/mainloop.c
@@ -37,7 +37,7 @@ static main_timer_table_t main_timer_table;
 #define MAIN_TIMER_LESS(x,y) ((x)->expires < (y)->expires)
 #define MAIN_TIMER_SWAP(heap,a,b,t) (t=heap[a], heap[a]=heap[b], heap[b]=t, heap[a]->index=(a), heap[b]->index=(b))
 
-clist main_file_list, main_hook_list, main_process_list;
+clist main_file_list, main_hook_list, main_hook_done_list, main_process_list;
 static uns main_file_cnt;
 static uns main_poll_table_obsolete, main_poll_table_size;
 static struct pollfd *main_poll_table;
@@ -68,6 +68,7 @@ main_init(void)
   main_timer_cnt = 0;
   clist_init(&main_file_list);
   clist_init(&main_hook_list);
+  clist_init(&main_hook_done_list);
   clist_init(&main_process_list);
   main_file_cnt = 0;
   main_poll_table_obsolete = 1;
@@ -413,6 +414,8 @@ main_debug(void)
        (long long)(fi->timer.expires ? fi->timer.expires-main_now : 999999), fi->data);
   msg(L_DEBUG, "\tActive hooks:");
   struct main_hook *ho;
+  CLIST_WALK(ho, main_hook_done_list)
+    msg(L_DEBUG, "\t\t%p (func %p, data %p)", ho, ho->handler, ho->data);
   CLIST_WALK(ho, main_hook_list)
     msg(L_DEBUG, "\t\t%p (func %p, data %p)", ho, ho->handler, ho->data);
   msg(L_DEBUG, "\tActive processes:");
@@ -469,17 +472,15 @@ main_loop(void)
        }
       int hook_min = HOOK_RETRY;
       int hook_max = HOOK_SHUTDOWN;
-      clist hook_done;
-      clist_init(&hook_done);
       while (ho = clist_remove_head(&main_hook_list))
        {
-         clist_add_tail(&hook_done, &ho->n);
+         clist_add_tail(&main_hook_done_list, &ho->n);
          DBG("MAIN: Hook %p", ho);
          int ret = ho->handler(ho);
          hook_min = MIN(hook_min, ret);
          hook_max = MAX(hook_max, ret);
        }
-      clist_move(&main_hook_list, &hook_done);
+      clist_move(&main_hook_list, &main_hook_done_list);
       if (hook_min == HOOK_SHUTDOWN ||
          hook_min == HOOK_DONE && hook_max == HOOK_DONE ||
          main_shutdown)

diff --git a/ucw/mainloop.h b/ucw/mainloop.h
index 90a4644d68dafb7ede7efd212f022bf202fe1060..0bf4e2edfadc10ea4577ecd41b8bf22470db0c7a 100644 (file)
--- a/ucw/mainloop.h
+++ b/ucw/mainloop.h
@@ -35,7 +35,7 @@
 extern timestamp_t main_now;                   /** Current time in milliseconds since the UNIX epoch. See @main_get_time(). **/
 extern ucw_time_t main_now_seconds;            /** Current time in seconds since the epoch. **/
 extern timestamp_t main_idle_time;             /** Total time in milliseconds spent in the poll() call. **/
-extern clist main_timer_list, main_file_list, main_hook_list, main_process_list;
+extern clist main_file_list, main_hook_list, main_hook_done_list, main_process_list;
 
 /**
  * This is a description of a timer.
@@ -261,6 +261,7 @@ enum main_hook_return {
 
 /**
  * Inserts a new hook into the loop.
+ * The hook will be scheduled at least once before next sleep.
  * May be called from inside a hook handler too.
  **/
 void hook_add(struct main_hook *ho);