summaryrefslogtreecommitdiff
path: root/content/fetchers/about.c
diff options
context:
space:
mode:
Diffstat (limited to 'content/fetchers/about.c')
-rw-r--r--content/fetchers/about.c44
1 files changed, 13 insertions, 31 deletions
diff --git a/content/fetchers/about.c b/content/fetchers/about.c
index dda8fc823..0e85eff10 100644
--- a/content/fetchers/about.c
+++ b/content/fetchers/about.c
@@ -1580,7 +1580,6 @@ static void fetch_about_free(void *ctx)
{
struct fetch_about_context *c = ctx;
nsurl_unref(c->url);
- RING_REMOVE(ring, c);
free(ctx);
}
@@ -1614,14 +1613,14 @@ static void fetch_about_abort(void *ctx)
*/
static void fetch_about_poll(lwc_string *scheme)
{
- struct fetch_about_context *c, *next;
- bool was_last_item = false;
-
- if (ring == NULL) return;
+ struct fetch_about_context *c, *save_ring = NULL;
/* Iterate over ring, processing each pending fetch */
- c = ring;
- do {
+ while (ring != NULL) {
+ /* Take the first entry from the ring */
+ c = ring;
+ RING_REMOVE(ring, c);
+
/* Ignore fetches that have been flagged as locked.
* This allows safe re-entrant calls to this function.
* Re-entrancy can occur if, as a result of a callback,
@@ -1629,7 +1628,7 @@ static void fetch_about_poll(lwc_string *scheme)
* again.
*/
if (c->locked == true) {
- next = c->r_next;
+ RING_INSERT(save_ring, c);
continue;
}
@@ -1639,32 +1638,15 @@ static void fetch_about_poll(lwc_string *scheme)
c->handler(c);
}
- /* Compute next fetch item at the last possible moment
- * as processing this item may have added to the ring
- */
- next = c->r_next;
- was_last_item = next == c;
-
+ /* And now finish */
fetch_remove_from_queues(c->fetchh);
fetch_free(c->fetchh);
+ }
- /* Having called into the fetch machinery, our ring might
- * have been updated
- */
- if (was_last_item) {
- /* We were previously the last item in the ring
- * so let's reset to the head of the ring
- * and try again
- */
- c = ring;
- } else {
- c = next;
- }
-
- /* Advance to next ring entry, exiting if we've reached
- * the start of the ring or the ring has become empty
- */
- } while (ring != NULL);
+ /* Finally, if we saved any fetches which were locked, put them back
+ * into the ring for next time
+ */
+ ring = save_ring;
}