[PATCH 1/3] Clean up CURL handles in unused request slots

[git.git] / http-fetch.c

diff --git a/http-fetch.c b/http-fetch.c
index da4d2f2..d26fae8 100644 (file)
--- a/http-fetch.c
+++ b/http-fetch.c
@@ -100,6 +100,8 @@ static char *ssl_key = NULL;
 static char *ssl_capath = NULL;
 #endif
 static char *ssl_cainfo = NULL;
+static long curl_low_speed_limit = -1;
+static long curl_low_speed_time = -1;
 
 struct buffer
 {
@@ -158,6 +160,17 @@ static int http_options(const char *var, const char *value)
        }
 #endif
 
+       if (!strcmp("http.lowspeedlimit", var)) {
+               if (curl_low_speed_limit == -1)
+                       curl_low_speed_limit = (long)git_config_int(var, value);
+               return 0;
+       }
+       if (!strcmp("http.lowspeedtime", var)) {
+               if (curl_low_speed_time == -1)
+                       curl_low_speed_time = (long)git_config_int(var, value);
+               return 0;
+       }
+
        /* Fall back on the default ones */
        return git_default_config(var, value);
 }
@@ -219,11 +232,11 @@ static size_t fwrite_sha1_file(void *ptr, size_t eltsize, size_t nmemb,
 }
 
 #ifdef USE_CURL_MULTI
-void process_curl_messages();
-void process_request_queue();
+static void process_curl_messages(void);
+static void process_request_queue(void);
 #endif
 
-static CURL* get_curl_handle()
+static CURL* get_curl_handle(void)
 {
        CURL* result = curl_easy_init();
 
@@ -246,10 +259,17 @@ static CURL* get_curl_handle()
                curl_easy_setopt(result, CURLOPT_CAINFO, ssl_cainfo);
        curl_easy_setopt(result, CURLOPT_FAILONERROR, 1);
 
+       if (curl_low_speed_limit > 0 && curl_low_speed_time > 0) {
+               curl_easy_setopt(result, CURLOPT_LOW_SPEED_LIMIT,
+                                curl_low_speed_limit);
+               curl_easy_setopt(result, CURLOPT_LOW_SPEED_TIME,
+                                curl_low_speed_time);
+       }
+
        return result;
 }
 
-struct active_request_slot *get_active_slot()
+static struct active_request_slot *get_active_slot(void)
 {
        struct active_request_slot *slot = active_queue_head;
        struct active_request_slot *newslot;
@@ -271,11 +291,7 @@ struct active_request_slot *get_active_slot()
        }
        if (slot == NULL) {
                newslot = xmalloc(sizeof(*newslot));
-#ifdef NO_CURL_EASY_DUPHANDLE
-               newslot->curl = get_curl_handle();
-#else
-               newslot->curl = curl_easy_duphandle(curl_default);
-#endif
+               newslot->curl = NULL;
                newslot->in_use = 0;
                newslot->next = NULL;
 
@@ -291,6 +307,14 @@ struct active_request_slot *get_active_slot()
                slot = newslot;
        }
 
+       if (slot->curl == NULL) {
+#ifdef NO_CURL_EASY_DUPHANDLE
+               slot->curl = get_curl_handle();
+#else
+               slot->curl = curl_easy_duphandle(curl_default);
+#endif
+       }
+
        active_requests++;
        slot->in_use = 1;
        slot->done = 0;
@@ -302,7 +326,7 @@ struct active_request_slot *get_active_slot()
        return slot;
 }
 
-int start_active_slot(struct active_request_slot *slot)
+static int start_active_slot(struct active_request_slot *slot)
 {
 #ifdef USE_CURL_MULTI
        CURLMcode curlm_result = curl_multi_add_handle(curlm, slot->curl);
@@ -317,7 +341,7 @@ int start_active_slot(struct active_request_slot *slot)
        return 1;
 }
 
-void run_active_slot(struct active_request_slot *slot)
+static void run_active_slot(struct active_request_slot *slot)
 {
 #ifdef USE_CURL_MULTI
        int num_transfers;
@@ -365,7 +389,7 @@ void run_active_slot(struct active_request_slot *slot)
 #endif
 }
 
-void start_request(struct transfer_request *request)
+static void start_request(struct transfer_request *request)
 {
        char *hex = sha1_to_hex(request->sha1);
        char prevfile[PATH_MAX];
@@ -491,7 +515,7 @@ void start_request(struct transfer_request *request)
        request->state = ACTIVE;
 }
 
-void finish_request(struct transfer_request *request)
+static void finish_request(struct transfer_request *request)
 {
        fchmod(request->local, 0444);
        close(request->local);
@@ -519,7 +543,7 @@ void finish_request(struct transfer_request *request)
                pull_say("got %s\n", sha1_to_hex(request->sha1));
 }
 
-void release_request(struct transfer_request *request)
+static void release_request(struct transfer_request *request)
 {
        struct transfer_request *entry = request_queue_head;
 
@@ -537,7 +561,7 @@ void release_request(struct transfer_request *request)
 }
 
 #ifdef USE_CURL_MULTI
-void process_curl_messages()
+void process_curl_messages(void)
 {
        int num_messages;
        struct active_request_slot *slot;
@@ -589,9 +613,10 @@ void process_curl_messages()
        }
 }
 
-void process_request_queue()
+void process_request_queue(void)
 {
        struct transfer_request *request = request_queue_head;
+       struct active_request_slot *slot = active_queue_head;
        int num_transfers;
 
        while (active_requests < max_requests && request != NULL) {
@@ -604,6 +629,14 @@ void process_request_queue()
                }
                request = request->next;
        }
+
+       while (slot != NULL) {
+               if (!slot->in_use && slot->curl != NULL) {
+                       curl_easy_cleanup(slot->curl);
+                       slot->curl = NULL;
+               }
+               slot = slot->next;
+       }                               
 }
 #endif
 
@@ -1010,8 +1043,8 @@ static int fetch_object(struct alt_base *repo, unsigned char *sha1)
        }
 
 #ifdef USE_CURL_MULTI
-       int num_transfers;
        while (request->state == WAITING) {
+               int num_transfers;
                curl_multi_perform(curlm, &num_transfers);
                if (num_transfers < active_requests) {
                        process_curl_messages();
@@ -1177,6 +1210,8 @@ int main(int argc, char **argv)
        char *url;
        int arg = 1;
        struct active_request_slot *slot;
+       char *low_speed_limit;
+       char *low_speed_time;
 
        while (arg < argc && argv[arg][0] == '-') {
                if (argv[arg][1] == 't') {
@@ -1207,9 +1242,11 @@ int main(int argc, char **argv)
        curl_global_init(CURL_GLOBAL_ALL);
 
 #ifdef USE_CURL_MULTI
-       char *http_max_requests = getenv("GIT_HTTP_MAX_REQUESTS");
-       if (http_max_requests != NULL)
-               max_requests = atoi(http_max_requests);
+       {
+               char *http_max_requests = getenv("GIT_HTTP_MAX_REQUESTS");
+               if (http_max_requests != NULL)
+                       max_requests = atoi(http_max_requests);
+       }
 
        curlm = curl_multi_init();
        if (curlm == NULL) {
@@ -1230,6 +1267,13 @@ int main(int argc, char **argv)
 #endif
        ssl_cainfo = getenv("GIT_SSL_CAINFO");
 
+       low_speed_limit = getenv("GIT_HTTP_LOW_SPEED_LIMIT");
+       if (low_speed_limit != NULL)
+               curl_low_speed_limit = strtol(low_speed_limit, NULL, 10);
+       low_speed_time = getenv("GIT_HTTP_LOW_SPEED_TIME");
+       if (low_speed_time != NULL)
+               curl_low_speed_time = strtol(low_speed_time, NULL, 10);
+
        git_config(http_options);
 
        if (curl_ssl_verify == -1)
@@ -1266,7 +1310,8 @@ int main(int argc, char **argv)
 #endif
        slot = active_queue_head;
        while (slot != NULL) {
-               curl_easy_cleanup(slot->curl);
+               if (slot->curl != NULL)
+                       curl_easy_cleanup(slot->curl);
                slot = slot->next;
        }
 #ifdef USE_CURL_MULTI