picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resolve: make DnsScope::conflict_queue an OrderedHashmap 

on_conflict_dispatch() uses hashmap_steal_first() and then does
something non-trivial with it. It may care about the order.
This commit is contained in:
Michal Schmidt 2014-08-22 13:56:51 +02:00
parent c9fe4af70d
commit 1e43061b67
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/resolve/resolved-dns-scope.c
View File

@ -82,10 +82,10 @@ DnsScope* dns_scope_free(DnsScope *s) {
dns_transaction_free(t);
}
while ((rr = hashmap_steal_first(s->conflict_queue)))
while ((rr = ordered_hashmap_steal_first(s->conflict_queue)))
dns_resource_record_unref(rr);
hashmap_free(s->conflict_queue);
ordered_hashmap_free(s->conflict_queue);
sd_event_source_unref(s->conflict_event_source);
dns_cache_flush(&s->cache);
@ -682,7 +682,7 @@ static int on_conflict_dispatch(sd_event_source *es, usec_t usec, void *userdata
_cleanup_(dns_resource_record_unrefp) DnsResourceRecord *rr = NULL;
_cleanup_(dns_packet_unrefp) DnsPacket *p = NULL;
rr = hashmap_steal_first(scope->conflict_queue);
rr = ordered_hashmap_steal_first(scope->conflict_queue);
if (!rr)
break;
@ -709,7 +709,7 @@ int dns_scope_notify_conflict(DnsScope *scope, DnsResourceRecord *rr) {
/* We don't send these queries immediately. Instead, we queue
* them, and send them after some jitter delay. */
r = hashmap_ensure_allocated(&scope->conflict_queue, &dns_resource_key_hash_ops);
r = ordered_hashmap_ensure_allocated(&scope->conflict_queue, &dns_resource_key_hash_ops);
if (r < 0) {
log_oom();
return r;
@ -718,7 +718,7 @@ int dns_scope_notify_conflict(DnsScope *scope, DnsResourceRecord *rr) {
/* We only place one RR per key in the conflict
* messages, not all of them. That should be enough to
* indicate where there might be a conflict */
r = hashmap_put(scope->conflict_queue, rr->key, rr);
r = ordered_hashmap_put(scope->conflict_queue, rr->key, rr);
if (r == -EEXIST || r == 0)
return 0;
if (r < 0) {

2
src/resolve/resolved-dns-scope.h
View File

@ -55,7 +55,7 @@ struct DnsScope {
DnsCache cache;
DnsZone zone;
Hashmap *conflict_queue;
OrderedHashmap *conflict_queue;
sd_event_source *conflict_event_source;
RateLimit ratelimit;