return (m == main_current_nocheck());
}
+static inline uns
+count_timers(struct main_context *m)
+{
+ if (m->timer_table)
+ return GARY_SIZE(m->timer_table) - 1;
+ else
+ return 0;
+}
+
struct main_context *
main_new(void)
{
return m;
}
-void
-main_delete(struct main_context *m)
+static void
+main_prepare_delete(struct main_context *m)
{
/*
* If the context is current, deactivate it first. But beware,
if (main_is_current(m))
main_switch_context(NULL);
+ // Close epoll descriptor early enough, it might be shared after fork!
+#ifdef CONFIG_UCW_EPOLL
+ xfree(m->epoll_events);
+ close(m->epoll_fd);
+ m->epoll_fd = -1;
+#else
+ GARY_FREE(m->poll_table);
+ GARY_FREE(m->poll_file_table);
+#endif
+
if (m->sigchld_handler)
{
signal_del_ctx(m, m->sigchld_handler);
close(m->sig_pipe_recv);
close(m->sig_pipe_send);
}
+}
+
+static void
+main_do_delete(struct main_context *m)
+{
+ GARY_FREE(m->timer_table);
+ xfree(m);
+}
+
+void
+main_delete(struct main_context *m)
+{
+ if (!m)
+ return;
+
+ 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));
ASSERT(clist_empty(&m->signal_list));
- GARY_FREE(m->timer_table);
+ ASSERT(!count_timers(m));
+ main_do_delete(m);
+}
+
+void
+main_destroy(struct main_context *m)
+{
+ if (!m)
+ return;
+ main_prepare_delete(m);
+
+ // Close all files
+ clist_insert_list_after(&m->file_active_list, m->file_list.head.prev);
#ifdef CONFIG_UCW_EPOLL
- ASSERT(clist_empty(&m->file_recalc_list));
- xfree(m->epoll_events);
- close(m->epoll_fd);
-#else
- GARY_FREE(m->poll_table);
- GARY_FREE(m->poll_file_table);
+ clist_insert_list_after(&m->file_recalc_list, m->file_list.head.prev);
#endif
- xfree(m);
+ CLIST_FOR_EACH(struct main_file *, f, m->file_list)
+ close(f->fd);
+
+ main_do_delete(m);
}
struct main_context *
void
main_cleanup(void)
{
- main_delete(main_current());
+ main_delete(main_current_nocheck());
}
void
-main_get_time(void)
+main_teardown(void)
{
- main_get_time_ctx(main_current());
+ main_destroy(main_current_nocheck());
}
-static inline uns
-count_timers(struct main_context *m)
+void
+main_get_time(void)
{
- if (m->timer_table)
- return GARY_SIZE(m->timer_table) - 1;
- else
- return 0;
+ main_get_time_ctx(main_current());
}
void
clist_unlink(&fi->n);
m->file_cnt--;
#ifdef CONFIG_UCW_EPOLL
- if (epoll_ctl(m->epoll_fd, EPOLL_CTL_DEL, fi->fd, NULL) < 0)
+ if (m->epoll_fd >= 0 && epoll_ctl(m->epoll_fd, EPOLL_CTL_DEL, fi->fd, NULL) < 0)
die("epoll_ctl() failed: %m");
#else
m->poll_table_obsolete = 1;
file_del_ctx(main_current(), fi);
}
-void
-file_close_all(void)
-{
- struct main_context *m = main_current();
-
- CLIST_FOR_EACH(struct main_file *, f, m->file_list)
- close(f->fd);
-}
-
void
hook_add(struct main_hook *ho)
{
signal_del_ctx(main_current(), ms);
}
+#ifdef CONFIG_DEBUG
+
+void
+file_debug(struct main_file *fi)
+{
+ msg(L_DEBUG, "\t\t%p (fd %d, rh %p, wh %p, data %p)",
+ fi, fi->fd, fi->read_handler, fi->write_handler, fi->data);
+}
+
+void
+hook_debug(struct main_hook *ho)
+{
+ msg(L_DEBUG, "\t\t%p (func %p, data %p)", ho, ho->handler, ho->data);
+}
+
+void
+signal_debug(struct main_signal *sg)
+{
+ if (sg->signum < 0)
+ msg(L_DEBUG, "\t\t(placeholder)");
+ else
+ msg(L_DEBUG, "\t\t%p (sig %d, func %p, data %p)", sg, sg->signum, sg->handler, sg->data);
+}
+
+static void
+timer_debug_ctx(struct main_context *m, struct main_timer *tm)
+{
+ msg(L_DEBUG, "\t\t%p (expires %lld, data %p)", tm, (long long)(tm->expires - m->now), tm->data);
+}
+
+void
+timer_debug(struct main_timer *tm)
+{
+ timer_debug_ctx(main_current(), tm);
+}
+
+void
+process_debug(struct main_process *pr)
+{
+ msg(L_DEBUG, "\t\t%p (pid %d, func %p, data %p)", pr, pr->pid, pr->handler, pr->data);
+}
+
void
main_debug_context(struct main_context *m UNUSED)
{
-#ifdef CONFIG_DEBUG
msg(L_DEBUG, "### Main loop status on %lld", (long long) m->now);
msg(L_DEBUG, "\tActive timers:");
uns num_timers = count_timers(m);
for (uns i = 1; i <= num_timers; i++)
- {
- struct main_timer *tm = m->timer_table[i];
- msg(L_DEBUG, "\t\t%p (expires %lld, data %p)", tm, (long long)(tm->expires ? tm->expires - m->now : 999999), tm->data);
- }
+ timer_debug(m->timer_table[i]);
msg(L_DEBUG, "\tActive files:");
CLIST_FOR_EACH(struct main_file *, fi, m->file_list)
- msg(L_DEBUG, "\t\t%p (fd %d, rh %p, wh %p, data %p)",
- fi, fi->fd, fi->read_handler, fi->write_handler, fi->data);
+ file_debug(fi);
CLIST_FOR_EACH(struct main_file *, fi, m->file_active_list)
- msg(L_DEBUG, "\t\t%p (fd %d, rh %p, wh %p, data %p) [pending events: %x]",
- fi, fi->fd, fi->read_handler, fi->write_handler, fi->data, fi->events);
- // FIXME: Can we display status of block_io requests somehow?
+ file_debug(fi);
#ifdef CONFIG_UCW_EPOLL
CLIST_FOR_EACH(struct main_file *, fi, m->file_recalc_list)
- msg(L_DEBUG, "\t\t%p (fd %d, rh %p, wh %p, data %p) [pending recalculation]",
- fi, fi->fd, fi->read_handler, fi->write_handler, fi->data);
+ file_debug(fi);
#endif
msg(L_DEBUG, "\tActive hooks:");
CLIST_FOR_EACH(struct main_hook *, ho, m->hook_done_list)
- msg(L_DEBUG, "\t\t%p (func %p, data %p)", ho, ho->handler, ho->data);
+ hook_debug(ho);
CLIST_FOR_EACH(struct main_hook *, ho, m->hook_list)
- msg(L_DEBUG, "\t\t%p (func %p, data %p)", ho, ho->handler, ho->data);
+ hook_debug(ho);
msg(L_DEBUG, "\tActive processes:");
CLIST_FOR_EACH(struct main_process *, pr, m->process_list)
- msg(L_DEBUG, "\t\t%p (pid %d, func %p, data %p)", pr, pr->pid, pr->handler, pr->data);
+ process_debug(pr);
msg(L_DEBUG, "\tActive signal catchers:");
CLIST_FOR_EACH(struct main_signal *, sg, m->signal_list)
- if (sg->signum < 0)
- msg(L_DEBUG, "\t\t(placeholder)");
- else
- msg(L_DEBUG, "\t\t%p (sig %d, func %p, data %p)", sg, sg->signum, sg->handler, sg->data);
-#endif
+ signal_debug(sg);
}
+#else
+
+// Stubs
+void file_debug(struct main_file *fi UNUSED) { }
+void hook_debug(struct main_hook *ho UNUSED) { }
+void signal_debug(struct main_signal *sg UNUSED) { }
+void timer_debug(struct main_timer *tm UNUSED) { }
+void process_debug(struct main_process *pr UNUSED) { }
+void main_debug_context(struct main_context *m UNUSED) { }
+
+#endif
+
static void
process_timers(struct main_context *m)
{
hook_min == HOOK_DONE && hook_max == HOOK_DONE ||
m->shutdown)
{
- DBG("MAIN: Shut down by %s", m->shutdown ? "main_shutdown" : "a hook");
+ DBG("MAIN: Shut down by %s", m->shutdown ? "main_shut_down" : "a hook");
return HOOK_SHUTDOWN;
}
if (hook_max == HOOK_RETRY)
struct main_context *m = main_current();
main_get_time_ctx(m);
+ m->shutdown = 0;
+
for (;;)
{
timestamp_t wake = m->now + 1000000000;
break;
default: ;
}
- if (count_timers(m))
- wake = MIN(wake, m->timer_table[1]->expires);
- main_get_time_ctx(m);
- int timeout = ((wake > m->now) ? wake - m->now : 0);
+
+ int timeout = 0;
+ if (!m->single_step)
+ {
+ if (count_timers(m))
+ wake = MIN(wake, m->timer_table[1]->expires);
+ main_get_time_ctx(m);
+ timeout = ((wake > m->now) ? wake - m->now : 0);
+ }
#ifdef CONFIG_UCW_EPOLL
recalc_files(m);
m->idle_time += m->now - old_now;
if (n <= 0)
- continue;
+ {
+ if (m->single_step)
+ return;
+ else
+ continue;
+ }
// Relink all files with a pending event to file_active_list
#ifdef CONFIG_UCW_EPOLL
}
}
}
+
+void
+main_step(void)
+{
+ struct main_context *m = main_current();
+ m->single_step = 1;
+ main_loop();
+ m->single_step = 0;
+}