/*
- * Sherlock Library -- Main Loop
+ * UCW Library -- Main Loop
*
- * (c) 2004 Martin Mares <mj@ucw.cz>
+ * (c) 2004--2006 Martin Mares <mj@ucw.cz>
*
* This software may be freely distributed and used according to the terms
* of the GNU Lesser General Public License.
#include <stdio.h>
#include <string.h>
-#include <stdlib.h>
#include <unistd.h>
#include <signal.h>
#include <fcntl.h>
#include <time.h>
#include <sys/poll.h>
#include <sys/wait.h>
+#include <sys/time.h>
-sh_time_t now;
+timestamp_t main_now;
+sh_time_t main_now_seconds;
uns main_shutdown;
clist main_timer_list, main_file_list, main_hook_list, main_process_list;
static struct pollfd *main_poll_table;
static uns main_sigchld_set_up;
+void
+main_get_time(void)
+{
+ struct timeval tv;
+ gettimeofday(&tv, NULL);
+ main_now_seconds = tv.tv_sec;
+ main_now = (timestamp_t)tv.tv_sec * 1000 + tv.tv_usec / 1000;
+ // DBG("It's %Ld o'clock", (long long) main_now);
+}
+
void
main_init(void)
{
clist_init(&main_file_list);
clist_init(&main_hook_list);
clist_init(&main_process_list);
- now = time(NULL);
+ main_file_cnt = 0;
+ main_poll_table_obsolete = 1;
+ main_get_time();
}
void
-timer_add(struct main_timer *tm, sh_time_t expires)
+timer_add(struct main_timer *tm, timestamp_t expires)
{
+ if (expires)
+ DBG("MAIN: Setting timer %p (expire at now+%Ld)", tm, (long long)(expires-main_now));
+ else
+ DBG("MAIN: Clearing timer %p", tm);
if (tm->expires)
clist_remove(&tm->n);
tm->expires = expires;
void
file_add(struct main_file *fi)
{
+ DBG("MAIN: Adding file %p (fd=%d)", fi, fi->fd);
ASSERT(!fi->n.next);
clist_add_tail(&main_file_list, &fi->n);
fi->timer.handler = file_timer_expired;
void
file_del(struct main_file *fi)
{
+ DBG("MAIN: Deleting file %p (fd=%d)", fi, fi->fd);
ASSERT(fi->n.next);
timer_del(&fi->timer);
clist_remove(&fi->n);
}
void
-file_set_timeout(struct main_file *fi, sh_time_t expires)
+file_set_timeout(struct main_file *fi, timestamp_t expires)
{
ASSERT(fi->n.next);
timer_add(&fi->timer, expires);
}
+void
+file_close_all(void)
+{
+ CLIST_FOR_EACH(struct main_file *, f, main_file_list)
+ close(f->fd);
+}
+
void
hook_add(struct main_hook *ho)
{
+ DBG("MAIN: Adding hook %p", ho);
ASSERT(!ho->n.next);
clist_add_tail(&main_hook_list, &ho->n);
}
void
hook_del(struct main_hook *ho)
{
+ DBG("MAIN: Deleting hook %p", ho);
ASSERT(ho->n.next);
clist_remove(&ho->n);
ho->n.next = ho->n.prev = NULL;
void
process_add(struct main_process *mp)
{
+ DBG("MAIN: Adding process %p (pid=%d)", mp, mp->pid);
ASSERT(!mp->n.next);
ASSERT(mp->handler);
clist_add_tail(&main_process_list, &mp->n);
void
process_del(struct main_process *mp)
{
+ DBG("MAIN: Deleting process %p (pid=%d)", mp, mp->pid);
ASSERT(mp->n.next);
clist_remove(&mp->n);
- mp->pid = 0;
mp->n.next = NULL;
}
int
process_fork(struct main_process *mp)
{
- ASSERT(!mp->pid);
pid_t pid = fork();
if (pid < 0)
{
void
main_debug(void)
{
-#ifdef DEBUG
- log(L_DEBUG, "### Main loop status on %d", (int)now);
+#ifdef CONFIG_DEBUG
+ log(L_DEBUG, "### Main loop status on %Ld", (long long)main_now);
log(L_DEBUG, "\tActive timers:");
struct main_timer *tm;
CLIST_WALK(tm, main_timer_list)
- log(L_DEBUG, "\t\t%p (expires %d, data %p)", tm, (int)tm->expires, tm->data);
+ log(L_DEBUG, "\t\t%p (expires %Ld, data %p)", tm, (long long)(tm->expires ? tm->expires-main_now : 999999), tm->data);
struct main_file *fi;
log(L_DEBUG, "\tActive files:");
CLIST_WALK(fi, main_file_list)
- log(L_DEBUG, "\t\t%p (fd %d, rh %p, wh %p, eh %p, expires %d, data %p)",
- fi, fi->fd, fi->read_handler, fi->write_handler, fi->error_handler, fi->timer.expires, fi->data);
+ log(L_DEBUG, "\t\t%p (fd %d, rh %p, wh %p, eh %p, expires %Ld, data %p)",
+ fi, fi->fd, fi->read_handler, fi->write_handler, fi->error_handler,
+ (long long)(fi->timer.expires ? fi->timer.expires-main_now : 999999), fi->data);
log(L_DEBUG, "\tActive hooks:");
struct main_hook *ho;
CLIST_WALK(ho, main_hook_list)
main_poll_table = xmalloc(sizeof(struct pollfd) * main_poll_table_size);
}
struct pollfd *p = main_poll_table;
- DBG("MAIN: Rebuliding poll table: %d of %d entries set", main_file_cnt, main_poll_table_size);
+ DBG("MAIN: Rebuilding poll table: %d of %d entries set", main_file_cnt, main_poll_table_size);
CLIST_WALK(fi, main_file_list)
{
p->fd = fi->fd;
struct main_process *pr;
cnode *tmp;
- while (!main_shutdown)
+ for (;;)
{
- now = time(NULL);
- sh_time_t wake = now + 60;
- while ((tm = clist_head(&main_timer_list)) && tm->expires <= now)
+ main_get_time();
+ timestamp_t wake = main_now + 1000000000;
+ while ((tm = clist_head(&main_timer_list)) && tm->expires <= main_now)
{
- DBG("MAIN: Timer %p expired", tm);
+ DBG("MAIN: Timer %p expired at now-%Ld", tm, (long long)(main_now - tm->expires));
tm->handler(tm);
}
+ int hook_min = HOOK_RETRY;
+ int hook_max = HOOK_SHUTDOWN;
CLIST_WALK_DELSAFE(ho, main_hook_list, tmp)
{
DBG("MAIN: Hook %p", ho);
- if (ho->handler(ho))
- wake = 0;
+ int ret = ho->handler(ho);
+ hook_min = MIN(hook_min, ret);
+ hook_max = MAX(hook_max, ret);
+ }
+ if (hook_min == HOOK_SHUTDOWN ||
+ hook_min == HOOK_DONE && hook_max == HOOK_DONE ||
+ main_shutdown)
+ {
+ DBG("MAIN: Shut down by %s", main_shutdown ? "main_shutdown" : "a hook");
+ return;
}
+ if (hook_max == HOOK_RETRY)
+ wake = 0;
if (main_poll_table_obsolete)
main_rebuild_poll_table();
if (!clist_empty(&main_process_list))
{
int stat;
pid_t pid;
+ wake = MIN(wake, main_now + 10000);
while ((pid = waitpid(-1, &stat, WNOHANG)) > 0)
{
DBG("MAIN: Child %d exited with status %x", pid, stat);
/* FIXME: Here is a small race window where SIGCHLD can come unnoticed. */
if ((tm = clist_head(&main_timer_list)) && tm->expires < wake)
wake = tm->expires;
- int timeout = (wake ? (wake - now) * 1000 : 0);
+ int timeout = (wake ? wake - main_now : 0);
DBG("MAIN: Poll for %d fds and timeout %d ms", main_file_cnt, timeout);
if (poll(main_poll_table, main_file_cnt, timeout))
{
struct pollfd *p = main_poll_table;
- now = time(NULL);
+ main_get_time();
CLIST_WALK(fi, main_file_list)
{
if (p->revents & (POLLIN | POLLHUP | POLLERR))
static void dtimer(struct main_timer *tm)
{
log(L_INFO, "Timer tick");
- timer_add(tm, now + 10);
+ timer_add(tm, main_now + 10000);
}
-static void dentry(struct main_process *pr UNUSED)
+static void dentry(void)
{
log(L_INFO, "*** SUBPROCESS START ***");
sleep(2);
log(L_INFO, "*** SUBPROCESS FINISH ***");
+ exit(0);
}
static void dexit(struct main_process *pr)
hook_add(&hook);
tm.handler = dtimer;
- timer_add(&tm, now + 1);
+ timer_add(&tm, main_now + 1000);
mp.handler = dexit;
if (!process_fork(&mp))
projects / libucw.git / blobdiff