summaryrefslogtreecommitdiff
path: root/event-internal.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-05-09 11:06:06 -0400
committerNick Mathewson <nickm@torproject.org>2012-05-09 12:06:00 -0400
commitc0e425abdcfc883fa70b6deafdf7327bfb75f02d (patch)
treed47ac72fa6388e0354bc9e18a2112b309c27a5d0 /event-internal.h
parent581b5beb98f45ec73ade6c8026f4fadef4325d4b (diff)
downloadlibevent-c0e425abdcfc883fa70b6deafdf7327bfb75f02d.tar.gz
Restore our priority-inversion-prevention code with deferreds
Back when deferred_cb stuff had its own queue, the queue was always executed, but we never ran more than 16 callbacks per iteration. That made for two problems: 1: Because deferred_cb stuff would always run, and had no priority, it could cause priority inversion. 2: It doesn't respect the max_dispatch_interval code. Then, when I refactored deferred_cb to be a special case of event_callback, that solved the above issues, but made for two more issues: 3: Because deferred_cb stuff would always get the default priority, it could could low-priority bufferevents to get too much priority. 4: With code like bufferevent_pair, it's easy to get into a situation where two deferreds keep adding one another, preventing the event loop from ever actually scanning for more events. This commit fixes the above by giving deferreds a better notion of priorities, and by limiting the number of deferreds that can be added to the _current_ loop iteration's active queues. (Extra deferreds are put into the active_later state.) That isn't an all-purpose priority inversion solution, of course: for that, you may need to mess around with max_dispatch_interval.
Diffstat (limited to 'event-internal.h')
-rw-r--r--event-internal.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/event-internal.h b/event-internal.h
index 4757836c..2c908208 100644
--- a/event-internal.h
+++ b/event-internal.h
@@ -218,6 +218,12 @@ struct event_base {
* reentrant invocation. */
int running_loop;
+ /** Set to the number of deferred_cbs we've made 'active' in the
+ * loop. This is a hack to prevent starvation; it would be smarter
+ * to just use event_config_set_max_dispatch_interval's max_callbacks
+ * feature */
+ int n_deferreds_queued;
+
/* Active event management. */
/** An array of nactivequeues queues for active event_callbacks (ones
* that have triggered, and whose callbacks need to be called). Low