static GSList *all_loops;
/* signals are global to all loops */
-struct {
+static struct {
guint installed; /* a ref count */
struct sigaction oldact;
} all_signals[NUM_SIGNALS];
/* a set of all possible signals */
-sigset_t all_signals_set;
+static sigset_t all_signals_set;
/* signals which cause a core dump, these can't be used for callbacks */
static gint core_signals[] =
GTimeVal last;
/* When this timer will next trigger */
GTimeVal timeout;
+
+ /* Only allow a timer's function to fire once per run through the list,
+ so that it doesn't get locked in there forever */
+ gboolean fired;
};
struct _ObMainLoopSignalHandlerType
/* only do this if we're the last loop destroyed */
if (!all_loops) {
- guint i;
-
/* grab all the signals that cause core dumps */
for (i = 0; i < NUM_CORE_SIGNALS; ++i) {
if (all_signals[core_signals[i]].installed) {
static glong timecompare(GTimeVal *a, GTimeVal *b)
{
glong r;
-
- if ((r = b->tv_sec - a->tv_sec)) return r;
- return b->tv_usec - a->tv_usec;
-
+ if ((r = a->tv_sec - b->tv_sec)) return r;
+ return a->tv_usec - b->tv_usec;
}
static void insert_timer(ObMainLoop *loop, ObMainLoopTimer *ins)
GSList *it;
for (it = loop->timers; it; it = g_slist_next(it)) {
ObMainLoopTimer *t = it->data;
- if (timecompare(&ins->timeout, &t->timeout) >= 0) {
+ if (timecompare(&ins->timeout, &t->timeout) <= 0) {
loop->timers = g_slist_insert_before(loop->timers, it, ins);
break;
}
GDestroyNotify notify)
{
ObMainLoopTimer *t = g_new(ObMainLoopTimer, 1);
+
+ g_assert(microseconds > 0); /* if it's 0 it'll cause an infinite loop */
+
t->delay = microseconds;
t->func = handler;
t->data = data;
for (it = loop->timers; it; it = next) {
ObMainLoopTimer *curr;
-
+
next = g_slist_next(it);
curr = it->data;
*/
if (curr->del_me) {
/* delete the top */
- loop->timers = g_slist_delete_link(loop->timers, it);
+ loop->timers = g_slist_delete_link(loop->timers, it);
if (curr->destroy)
curr->destroy(curr->data);
g_free(curr);
continue;
}
- /* the queue is sorted, so if this timer shouldn't fire, none are
+ /* the queue is sorted, so if this timer shouldn't fire, none are
ready */
- if (timecompare(&NEAREST_TIMEOUT(loop), &loop->now) < 0)
+ if (timecompare(&NEAREST_TIMEOUT(loop), &loop->now) > 0)
break;
/* we set the last fired time to delay msec after the previous firing,
g_free(curr);
}
+ /* the timer queue has been shuffled, start from the beginning
+ (which is the next one to fire) */
+ next = loop->timers;
+
fired = TRUE;
}