diff options
author | Yu Jiung <jiung.yu@samsung.com> | 2016-11-09 11:15:33 +0900 |
---|---|---|
committer | Yu Jiung <jiung.yu@samsung.com> | 2016-11-09 11:15:43 +0900 |
commit | b6627e2c19506bd30328969ea8aab73fa0945f36 (patch) | |
tree | 24b768763efadd60f318873601e58dd98fe9714c /ares_cancel.c | |
parent | b8e6c26b7b9608dffc84645f17fe4cf534af18dd (diff) | |
download | c-ares-b6627e2c19506bd30328969ea8aab73fa0945f36.tar.gz c-ares-b6627e2c19506bd30328969ea8aab73fa0945f36.tar.bz2 c-ares-b6627e2c19506bd30328969ea8aab73fa0945f36.zip |
Imported Upstream version 1.10.0
Change-Id: Ic7f3b0ad7dca62abe4cfa642a5eb5e190eb7a8c9
Diffstat (limited to 'ares_cancel.c')
-rw-r--r-- | ares_cancel.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/ares_cancel.c b/ares_cancel.c index eb790ae..465cc9e 100644 --- a/ares_cancel.c +++ b/ares_cancel.c @@ -14,7 +14,7 @@ #include "ares_setup.h" #include <assert.h> -#include <stdlib.h> + #include "ares.h" #include "ares_private.h" @@ -26,33 +26,33 @@ void ares_cancel(ares_channel channel) { struct query *query; + struct list_node list_head_copy; struct list_node* list_head; struct list_node* list_node; int i; - list_head = &(channel->all_queries); - for (list_node = list_head->next; list_node != list_head; ) + if (!ares__is_list_empty(&(channel->all_queries))) { - query = list_node->data; - list_node = list_node->next; /* since we're deleting the query */ - query->callback(query->arg, ARES_ECANCELLED, 0, NULL, 0); - ares__free_query(query); - } -#ifndef NDEBUG - /* Freeing the query should remove it from all the lists in which it sits, - * so all query lists should be empty now. - */ - assert(ares__is_list_empty(&(channel->all_queries))); - for (i = 0; i < ARES_QID_TABLE_SIZE; i++) + /* Swap list heads, so that only those queries which were present on entry + * into this function are cancelled. New queries added by callbacks of + * queries being cancelled will not be cancelled themselves. + */ + list_head = &(channel->all_queries); + list_head_copy.prev = list_head->prev; + list_head_copy.next = list_head->next; + list_head_copy.prev->next = &list_head_copy; + list_head_copy.next->prev = &list_head_copy; + list_head->prev = list_head; + list_head->next = list_head; + for (list_node = list_head_copy.next; list_node != &list_head_copy; ) { - assert(ares__is_list_empty(&(channel->queries_by_qid[i]))); + query = list_node->data; + list_node = list_node->next; /* since we're deleting the query */ + query->callback(query->arg, ARES_ECANCELLED, 0, NULL, 0); + ares__free_query(query); } - for (i = 0; i < ARES_TIMEOUT_TABLE_SIZE; i++) - { - assert(ares__is_list_empty(&(channel->queries_by_timeout[i]))); - } -#endif - if (!(channel->flags & ARES_FLAG_STAYOPEN)) + } + if (!(channel->flags & ARES_FLAG_STAYOPEN) && ares__is_list_empty(&(channel->all_queries))) { if (channel->servers) { |