asyn-thread: avoid the separate 'struct resdata' alloc

Instead move the only struct field (start) into the thread_data struct.

Closes #16321

diff --git a/lib/asyn-thread.c b/lib/asyn-thread.c
index 1fe88f9b0b4f8cc8ab553c9b74365d85ba73ca5c..b6cf8dfa832b7ce97d98217d7292b53d8533e0ee 100644 (file)
--- a/lib/asyn-thread.c
+++ b/lib/asyn-thread.c
@@ -78,9 +78,6 @@
 #include "curl_memory.h"
 #include "memdebug.h"
 
-struct resdata {
-  struct curltime start;
-};
 
 /*
  * Curl_resolver_global_init()
@@ -110,9 +107,7 @@ void Curl_resolver_global_cleanup(void)
 CURLcode Curl_resolver_init(struct Curl_easy *easy, void **resolver)
 {
   (void)easy;
-  *resolver = calloc(1, sizeof(struct resdata));
-  if(!*resolver)
-    return CURLE_OUT_OF_MEMORY;
+  (void)resolver;
   return CURLE_OK;
 }
 
@@ -124,7 +119,7 @@ CURLcode Curl_resolver_init(struct Curl_easy *easy, void **resolver)
  */
 void Curl_resolver_cleanup(void *resolver)
 {
-  free(resolver);
+  (void)resolver;
 }
 
 /*
@@ -452,6 +447,7 @@ static bool init_resolve_thread(struct Curl_easy *data,
   async->status = 0;
   async->dns = NULL;
   td->thread_hnd = curl_thread_t_null;
+  td->start = Curl_now();
 
   if(!init_thread_sync_data(td, hostname, port, hints)) {
     free(td);
@@ -646,9 +642,6 @@ CURLcode Curl_resolver_is_resolved(struct Curl_easy *data,
 int Curl_resolver_getsock(struct Curl_easy *data, curl_socket_t *socks)
 {
   int ret_val = 0;
-  timediff_t milli;
-  timediff_t ms;
-  struct resdata *reslv = (struct resdata *)data->state.async.resolver;
 #ifndef CURL_DISABLE_SOCKETPAIR
   struct thread_data *td = &data->state.async.thdata;
 #endif
@@ -668,14 +661,13 @@ int Curl_resolver_getsock(struct Curl_easy *data, curl_socket_t *socks)
   }
 #endif
 #ifndef CURL_DISABLE_SOCKETPAIR
-  if(td) {
-    /* return read fd to client for polling the DNS resolution status */
-    socks[socketi] = td->tsd.sock_pair[0];
-    ret_val |= GETSOCK_READSOCK(socketi);
-  }
-  else {
-#endif
-    ms = Curl_timediff(Curl_now(), reslv->start);
+  /* return read fd to client for polling the DNS resolution status */
+  socks[socketi] = td->tsd.sock_pair[0];
+  ret_val |= GETSOCK_READSOCK(socketi);
+#else
+  {
+    timediff_t milli;
+    timediff_t ms = Curl_timediff(Curl_now(), td->start);
     if(ms < 3)
       milli = 0;
     else if(ms <= 50)
@@ -685,11 +677,9 @@ int Curl_resolver_getsock(struct Curl_easy *data, curl_socket_t *socks)
     else
       milli = 200;
     Curl_expire(data, milli, EXPIRE_ASYNC_NAME);
-#ifndef CURL_DISABLE_SOCKETPAIR
   }
 #endif
 
-
   return ret_val;
 }
 
@@ -702,12 +692,10 @@ struct Curl_addrinfo *Curl_resolver_getaddrinfo(struct Curl_easy *data,
                                                 int port,
                                                 int *waitp)
 {
-  struct resdata *reslv = (struct resdata *)data->state.async.resolver;
+  struct thread_data *td = &data->state.async.thdata;
 
   *waitp = 0; /* default to synchronous response */
 
-  reslv->start = Curl_now();
-
   /* fire up a new resolver thread! */
   if(init_resolve_thread(data, hostname, port, NULL)) {
     *waitp = 1; /* expect asynchronous response */
@@ -731,8 +719,6 @@ struct Curl_addrinfo *Curl_resolver_getaddrinfo(struct Curl_easy *data,
 {
   struct addrinfo hints;
   int pf = PF_INET;
-  struct resdata *reslv = (struct resdata *)data->state.async.resolver;
-
   *waitp = 0; /* default to synchronous response */
 
 #ifdef CURLRES_IPV6
@@ -750,7 +736,6 @@ struct Curl_addrinfo *Curl_resolver_getaddrinfo(struct Curl_easy *data,
   hints.ai_socktype = (data->conn->transport == TRNSPRT_TCP) ?
     SOCK_STREAM : SOCK_DGRAM;
 
-  reslv->start = Curl_now();
   /* fire up a new resolver thread! */
   if(init_resolve_thread(data, hostname, port, &hints)) {
     *waitp = 1; /* expect asynchronous response */

diff --git a/lib/asyn.h b/lib/asyn.h
index d22378f06cdc7caa6df6aad7e8ae740d138537bd..21b01fe984eabda30f109811fc5b91348abd8833 100644 (file)
--- a/lib/asyn.h
+++ b/lib/asyn.h
@@ -58,6 +58,7 @@ struct thread_data {
   curl_thread_t thread_hnd;
   unsigned int poll_interval;
   timediff_t interval_end;
+  struct curltime start;
   struct thread_sync_data tsd;
 #if defined(USE_HTTPSRR) && defined(USE_ARES)
   struct Curl_https_rrinfo hinfo;