qu->back= qu->next= qu->parent= 0;
LIST_INIT(qu->children);
qu->siblings.next= qu->siblings.back= 0;
- qu->allocations= 0;
+ LIST_INIT(qu->allocations);
qu->interim_allocd= 0;
qu->final_allocspace= 0;
assert(!qu->final_allocspace);
an= malloc(MEM_ROUND(MEM_ROUND(sizeof(*an)) + sz));
if (!an) return 0;
- an->next= qu->allocations;
- qu->allocations= an;
+ LIST_LINK_TAIL(qu->allocations,an);
return (byte*)an + MEM_ROUND(sizeof(*an));
}
return alloc_common(qu,MEM_ROUND(sz));
}
+void adns__transfer_interim(adns_query from, adns_query to, void *block, size_t sz) {
+ allocnode *an;
+
+ if (!block) return;
+ an= (void*)((byte*)block - MEM_ROUND(sizeof(*an)));
+
+ assert(!to->final_allocspace);
+ assert(!from->final_allocspace);
+
+ LIST_UNLINK(from->allocations,an);
+ LIST_LINK_TAIL(to->allocations,an);
+
+ from->interim_allocd -= sz;
+ to->interim_allocd += sz;
+}
+
void *adns__alloc_final(adns_query qu, size_t sz) {
/* When we're in the _final stage, we _subtract_ from interim_alloc'd
* each allocation, and use final_allocspace to point to the next free
ncqu= cqu->siblings.next;
adns_cancel(cqu);
}
- for (an= qu->allocations; an; an= ann) { ann= an->next; free(an); }
+ for (an= qu->allocations.head; an; an= ann) { ann= an->next; free(an); }
adns__vbuf_free(&qu->vb);
}
free(qu->answer);
free(qu);
}
-
-void adns__query_done(adns_query qu) {
+
+static void makefinal_query(adns_query qu) {
adns_answer *ans;
int rrn;
ans= qu->answer;
-
+
if (qu->interim_allocd) {
- if (qu->answer->nrrs && qu->typei->diff_needswap) {
- if (!adns__vbuf_ensure(&qu->vb,qu->typei->rrsz)) {
- adns__query_fail(qu,adns_s_nolocalmem);
- return;
- }
- }
ans= realloc(qu->answer, MEM_ROUND(MEM_ROUND(sizeof(*ans)) + qu->interim_allocd));
- if (!ans) {
- qu->answer->cname= 0;
- adns__query_fail(qu, adns_s_nolocalmem);
- return;
- }
+ if (!ans) goto x_nomem;
qu->answer= ans;
}
for (rrn=0; rrn<ans->nrrs; rrn++)
qu->typei->makefinal(qu, ans->rrs.bytes + rrn*ans->rrsz);
-
- if (qu->typei->diff_needswap)
- adns__isort(ans->rrs.bytes, ans->nrrs, ans->rrsz,
- qu->vb.buf, qu->typei->diff_needswap);
}
-
+
free_query_allocs(qu);
+ return;
+ x_nomem:
+ qu->answer->status= adns_s_nolocalmem;
+ qu->answer->cname= 0;
+ adns__reset_cnameonly(qu);
+ free_query_allocs(qu);
+}
+
+void adns__query_done(adns_query qu) {
+ adns_answer *ans;
+ adns_query parent;
+
qu->id= -1;
- LIST_LINK_TAIL(qu->ads->output,qu);
+ ans= qu->answer;
+
+ if (ans->nrrs && qu->typei->diff_needswap) {
+ if (!adns__vbuf_ensure(&qu->vb,qu->typei->rrsz)) {
+ adns__query_fail(qu,adns_s_nolocalmem);
+ return;
+ }
+ adns__isort(ans->rrs.bytes, ans->nrrs, ans->rrsz,
+ qu->vb.buf, qu->typei->diff_needswap);
+ }
+
+ parent= qu->parent;
+ if (parent) {
+ LIST_UNLINK_PART(parent->children,qu,siblings.);
+ qu->context.intern.callback(parent,qu);
+ free_query_allocs(qu);
+ free(qu);
+ if (!parent->children.head) adns__query_done(parent);
+ } else {
+ makefinal_query(qu);
+ LIST_LINK_TAIL(qu->ads->output,qu);
+ }
}
void adns__query_fail(adns_query qu, adns_status stat) {