Merge branch 'ondrej/cleanup-isc_astack-usage-in-netmgr' into 'main'

Convert isc_astack usage in netmgr to mempool and ISC_LIST

See merge request isc-projects/bind9!7300

Author: oerdnj

lib/isc/Makefile.am

@@ -8,7 +8,6 @@ libisc_la_HEADERS =			\
 	include/isc/align.h		\
 	include/isc/ascii.h		\
 	include/isc/assertions.h	\
-	include/isc/astack.h		\
 	include/isc/async.h		\
 	include/isc/atomic.h		\
 	include/isc/attributes.h	\
@@ -122,7 +121,6 @@ libisc_la_SOURCES =		\
 	aes.c			\
 	ascii.c			\
 	assertions.c		\
-	astack.c		\
 	async.c			\
 	backtrace.c		\
 	base32.c		\

lib/isc/astack.c

@@ -33,9 +33,8 @@
 
 /* Core Types.  Alphabetized by defined type. */
 
-typedef struct isc_astack isc_astack_t;		 /*%< Array-based fast stack */
-typedef struct isc_buffer isc_buffer_t;		 /*%< Buffer */
-typedef ISC_LIST(isc_buffer_t) isc_bufferlist_t; /*%< Buffer List */
+typedef struct isc_buffer isc_buffer_t;			  /*%< Buffer */
+typedef ISC_LIST(isc_buffer_t) isc_bufferlist_t;	  /*%< Buffer List */
 typedef struct isc_constregion	   isc_constregion_t;	  /*%< Const region */
 typedef struct isc_consttextregion isc_consttextregion_t; /*%< Const Text Region
 							   */

lib/isc/include/isc/astack.h

@@ -18,7 +18,6 @@
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 
-#include <isc/astack.h>
 #include <isc/atomic.h>
 #include <isc/barrier.h>
 #include <isc/buffer.h>
@@ -201,6 +200,7 @@ typedef struct isc__networker {
 
 	ISC_LIST(isc_nmsocket_t) active_sockets;
 
+	isc_mempool_t *uvreq_pool;
 } isc__networker_t;
 
 ISC_REFCOUNT_DECL(isc__networker);
@@ -245,6 +245,7 @@ struct isc_nmhandle {
 	int backtrace_size;
 #endif
 	LINK(isc_nmhandle_t) active_link;
+	LINK(isc_nmhandle_t) inactive_link;
 	void *opaque;
 };
 
@@ -323,6 +324,7 @@ struct isc__nm_uvreq {
 		uv_fs_t fs;
 	} uv_req;
 	ISC_LINK(isc__nm_uvreq_t) link;
+	ISC_LINK(isc__nm_uvreq_t) inactive_link;
 };
 
 void *
@@ -987,8 +989,7 @@ struct isc_nmsocket {
 	 * 'spare' handles for that can be reused to avoid allocations,
 	 * for UDP.
 	 */
-	isc_astack_t *inactivehandles;
-	isc_astack_t *inactivereqs;
+	ISC_LIST(isc_nmhandle_t) inactive_handles;
 
 	/*%
 	 * Used to pass a result back from listen or connect events.