TELECOM-11880: rest socket change

Author: davidtrihy-genesys

modules/rest_client/rest_methods.c

@@ -1662,7 +1662,7 @@ int connect_only(preconnect_urls *precon_urls, int total_cons) {
 		start = start->next;
 	}
 
-	busy_wait = connect_poll_interval;
+	busy_wait = 100;
 
 	if (setsocket_callback(multi_handle) != 0) {
 		goto cleanup;
@@ -1686,11 +1686,11 @@ int connect_only(preconnect_urls *precon_urls, int total_cons) {
 
 		if (timer < 0) {
 			break;
-		} 
+		}
 
 		usleep(1000UL * busy_wait);
 		LM_DBG("Creating warm pool connection, running handles %d\n", running_handles);
-	} while (running_handles != 0);
+	} while (running_sockets());
 
 cleanup:
 	do {

modules/rest_client/rest_sockets.c

@@ -81,6 +81,21 @@ int get_max_fd(int no_max_default) {
     return ((fds.max_fd_index << 3) + WORD_SIZE_BITS - 1) - COUNT_LEADING_ZEROS(sockets);
 }
 
+int running_sockets(void) {
+	cpuword_t sockets;
+    int running, curl_fd;
+
+	for (int i = 0; i <= fds.max_fd_index; i += WORD_SIZE_BYTES) {
+		memcpy(&sockets, fds.tracked_socks + i, sizeof(cpuword_t));
+
+		if (sockets) {
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
 static void add_sock(int s) {
     int sock_index = s >> 3;
 

modules/rest_client/rest_sockets.h

@@ -28,6 +28,7 @@
 
 int init_process_limits(rlim_t rlim_cur);
 int get_max_fd(int no_max_default);
+int running_sockets(void);
 int start_multi_socket(CURLM *multi_handle);
 int run_multi_socket(CURLM *multi_handle);
 int setsocket_callback(CURLM *multi_handle);