[PATCH 1/3] Clean up CURL handles in unused request slots
Clean up CURL handles in unused request slots Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Nick Hengeveld committed
Oct 21, 2005 at 12:06 UTC
f1a906a387a2155069e02b09c33dabd6d058ede5
1 file changed
+20
-6
http-fetch.c
+20
-6
@@ -291,11 +291,7 @@ static struct active_request_slot *get_active_slot(void)
291
}
292
if (slot == NULL) {
293
newslot = xmalloc(sizeof(*newslot));
294
-#ifdef NO_CURL_EASY_DUPHANDLE
295
- newslot->curl = get_curl_handle();
296
-#else
297
- newslot->curl = curl_easy_duphandle(curl_default);
298
-#endif
294
+ newslot->curl = NULL;
295
newslot->in_use = 0;
296
newslot->next = NULL;
297
@@ -311,6 +307,14 @@ static struct active_request_slot *get_active_slot(void)
307
slot = newslot;
308
}
309
310
+ if (slot->curl == NULL) {
311
+#ifdef NO_CURL_EASY_DUPHANDLE
312
+ slot->curl = get_curl_handle();
313
+#else
314
+ slot->curl = curl_easy_duphandle(curl_default);
315
+#endif
316
+ }
317
+
318
active_requests++;
319
slot->in_use = 1;
320
slot->done = 0;
@@ -612,6 +616,7 @@ void process_curl_messages(void)
616
void process_request_queue(void)
617
{
618
struct transfer_request *request = request_queue_head;
619
+ struct active_request_slot *slot = active_queue_head;
620
int num_transfers;
621
622
while (active_requests < max_requests && request != NULL) {
@@ -624,6 +629,14 @@ void process_request_queue(void)
629
}
630
request = request->next;
631
}
632
+
633
+ while (slot != NULL) {
634
+ if (!slot->in_use && slot->curl != NULL) {
635
+ curl_easy_cleanup(slot->curl);
636
+ slot->curl = NULL;
637
+ }
638
+ slot = slot->next;
639
+ }
640
}
641
#endif
642
@@ -1297,7 +1310,8 @@ int main(int argc, char **argv)
1310
#endif
1311
slot = active_queue_head;
1312
while (slot != NULL) {
1300
- curl_easy_cleanup(slot->curl);
1313
+ if (slot->curl != NULL)
1314
+ curl_easy_cleanup(slot->curl);
1315
slot = slot->next;
1316
}
1317
#ifdef USE_CURL_MULTI