src/: Track sizes of interim-allocated blocks.

Now callers don't need to keep track of them by hand, which is annoying
and fiddly.

Signed-off-by: Mark Wooding <mdw@distorted.org.uk>

diff --git a/src/internal.h b/src/internal.h
index f25fe9c4240f8b933c8f5ff80c2e2738d49cf668..7faa2123c4abe4bffec95183ed607c0ed1551536 100644 (file)
--- a/src/internal.h
+++ b/src/internal.h
@@ -229,6 +229,7 @@ adns_status adns__ckl_hostname(adns_state ads, adns_queryflags flags,
 
 typedef struct allocnode {
   struct allocnode *next, *back;
 
 typedef struct allocnode {
   struct allocnode *next, *back;

+  size_t sz;

 } allocnode;
 
 union maxalign {
 } allocnode;
 
 union maxalign {


@@ -657,8 +658,7 @@ void *adns__alloc_preserved(adns_query qu, size_t sz);
  *  answer->cname and answer->owner are _preserved.
  */
 
  *  answer->cname and answer->owner are _preserved.
  */
 

-void adns__transfer_interim(adns_query from, adns_query to,
-                           void *block, size_t sz);
+void adns__transfer_interim(adns_query from, adns_query to, void *block);

 /* Transfers an interim allocation from one query to another, so that
  * the `to' query will have room for the data when we get to makefinal
  * and so that the free will happen when the `to' query is freed
 /* Transfers an interim allocation from one query to another, so that
  * the `to' query will have room for the data when we get to makefinal
  * and so that the free will happen when the `to' query is freed

diff --git a/src/query.c b/src/query.c
index c32acbacf2cec16303c9528d7035bbfbed451478..c18ba8e991c3481f33057bf44145a6025a2d3605 100644 (file)
--- a/src/query.c
+++ b/src/query.c
@@ -382,6 +382,7 @@ static void *alloc_common(adns_query qu, size_t sz) {
   an= malloc(MEM_ROUND(MEM_ROUND(sizeof(*an)) + sz));
   if (!an) return 0;
   LIST_LINK_TAIL(qu->allocations,an);
   an= malloc(MEM_ROUND(MEM_ROUND(sizeof(*an)) + sz));
   if (!an) return 0;
   LIST_LINK_TAIL(qu->allocations,an);

+  an->sz= sz;

   return (byte*)an + MEM_ROUND(sizeof(*an));
 }
 
   return (byte*)an + MEM_ROUND(sizeof(*an));
 }
 


@@ -405,16 +406,24 @@ void *adns__alloc_preserved(adns_query qu, size_t sz) {
   return rv;
 }
 
   return rv;
 }
 

+static allocnode *alloc_info(adns_query qu, void *p, size_t *sz_r) {
+  allocnode *an;
+
+  if (!p || p == qu) { *sz_r= 0; return 0; }
+  an= (allocnode *)((byte *)p - MEM_ROUND(sizeof(allocnode)));
+  *sz_r= MEM_ROUND(an->sz);
+  return an;
+}
+

 void *adns__alloc_mine(adns_query qu, size_t sz) {
   return alloc_common(qu,MEM_ROUND(sz));
 }
 
 void *adns__alloc_mine(adns_query qu, size_t sz) {
   return alloc_common(qu,MEM_ROUND(sz));
 }
 

-void adns__transfer_interim(adns_query from, adns_query to,
-                           void *block, size_t sz) {
-  allocnode *an;
+void adns__transfer_interim(adns_query from, adns_query to, void *block) {
+  size_t sz;
+  allocnode *an= alloc_info(from, block, &sz);

 
 

-  if (!block) return;
-  an= (void*)((byte*)block - MEM_ROUND(sizeof(*an)));
+  if (!an) return;

 
   assert(!to->final_allocspace);
   assert(!from->final_allocspace);
 
   assert(!to->final_allocspace);
   assert(!from->final_allocspace);


@@ -422,7 +431,6 @@ void adns__transfer_interim(adns_query from, adns_query to,
   LIST_UNLINK(from->allocations,an);
   LIST_LINK_TAIL(to->allocations,an);
 
   LIST_UNLINK(from->allocations,an);
   LIST_LINK_TAIL(to->allocations,an);
 

-  sz= MEM_ROUND(sz);

   from->interim_allocd -= sz;
   to->interim_allocd += sz;
 
   from->interim_allocd -= sz;
   to->interim_allocd += sz;
 

diff --git a/src/types.c b/src/types.c
index ac6b310cf99fd3128d19a8fe18637ea7c4bfc36f..7cae88178dd2cf7407987a0c90d1fece8590301a 100644 (file)
--- a/src/types.c
+++ b/src/types.c
@@ -514,13 +514,12 @@ static void icb_hostaddr(adns_query parent, adns_query child) {
   adns_rr_hostaddr *rrp= child->ctx.pinfo.hostaddr;
   adns_state ads= parent->ads;
   adns_status st;
   adns_rr_hostaddr *rrp= child->ctx.pinfo.hostaddr;
   adns_state ads= parent->ads;
   adns_status st;

-  size_t addrsz= gsz_addr(0, parent->answer->type);

 
   st= cans->status;
   rrp->astatus= st;
   rrp->naddrs= (st>0 && st<=adns_s_max_tempfail) ? -1 : cans->nrrs;
   rrp->addrs= cans->rrs.addr;
 
   st= cans->status;
   rrp->astatus= st;
   rrp->naddrs= (st>0 && st<=adns_s_max_tempfail) ? -1 : cans->nrrs;
   rrp->addrs= cans->rrs.addr;

-  adns__transfer_interim(child, parent, rrp->addrs, rrp->naddrs*addrsz);
+  adns__transfer_interim(child, parent, rrp->addrs);

 
   if (parent->children.head) {
     LIST_LINK_TAIL(ads->childw,parent);
 
   if (parent->children.head) {
     LIST_LINK_TAIL(ads->childw,parent);