{"thread":{"id":"2039","subject":"[PATCH] Only compile parallel HTTP support with CURL >= 7.9.8","startedAt":"2005-10-07T00:04:06Z","lastAt":"2005-10-07T00:04:06Z","messageCount":1,"participants":["Nick Hengeveld"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"9785","messageId":"20051007000406.GI15593@reactrix.com","threadId":"2039","inReplyTo":null,"subject":"[PATCH] Only compile parallel HTTP support with CURL >= 7.9.8","fromName":"Nick Hengeveld","fromEmail":"nickh@reactrix.com","sentAt":"2005-10-07T00:04:06Z","receivedAt":"2005-10-07T00:04:06Z","isPatch":true,"sender":{"key":"nickh@reactrix.com","avatar":null},"body":"Only compile parallel HTTP support with CURL >= 7.9.8\n\nSigned-off-by: Nick Hengeveld <nickh@reactrix.com>\n\n\n---\n\n http-fetch.c |   62 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----\n 1 files changed, 57 insertions(+), 5 deletions(-)\n\n2677e4eab199eb43f5e3a865e4008d3db79708a5\ndiff --git a/http-fetch.c b/http-fetch.c\n--- a/http-fetch.c\n+++ b/http-fetch.c\n@@ -6,7 +6,10 @@\n #include <curl/curl.h>\n #include <curl/easy.h>\n \n+#if LIBCURL_VERSION_NUM >= 0x070908\n+#define USE_CURL_MULTI\n #define DEFAULT_MAX_REQUESTS 5\n+#endif\n \n #if LIBCURL_VERSION_NUM < 0x070704\n #define curl_global_cleanup() do { /* nothing */ } while(0)\n@@ -18,11 +21,13 @@\n #define PREV_BUF_SIZE 4096\n #define RANGE_HEADER_SIZE 30\n \n-static int max_requests = DEFAULT_MAX_REQUESTS;\n static int active_requests = 0;\n static int data_received;\n \n+#ifdef USE_CURL_MULTI\n+static int max_requests = DEFAULT_MAX_REQUESTS;\n static CURLM *curlm;\n+#endif\n static CURL *curl_default;\n static struct curl_slist *no_pragma_header;\n static struct curl_slist *no_range_header;\n@@ -151,13 +156,17 @@ int relink_or_rename(char *old, char *ne\n \treturn 0;\n }\n \n+#ifdef USE_CURL_MULTI\n void process_curl_messages();\n void process_request_queue();\n+#endif\n \n struct active_request_slot *get_active_slot()\n {\n \tstruct active_request_slot *slot = active_queue_head;\n \tstruct active_request_slot *newslot;\n+\n+#ifdef USE_CURL_MULTI\n \tint num_transfers;\n \n \t/* Wait for a slot to open up if the queue is full */\n@@ -167,6 +176,7 @@ struct active_request_slot *get_active_s\n \t\t\tprocess_curl_messages();\n \t\t}\n \t}\n+#endif\n \n \twhile (slot != NULL && slot->in_use) {\n \t\tslot = slot->next;\n@@ -202,6 +212,7 @@ struct active_request_slot *get_active_s\n \n int start_active_slot(struct active_request_slot *slot)\n {\n+#ifdef USE_CURL_MULTI\n \tCURLMcode curlm_result = curl_multi_add_handle(curlm, slot->curl);\n \n \tif (curlm_result != CURLM_OK &&\n@@ -210,12 +221,13 @@ int start_active_slot(struct active_requ\n \t\tslot->in_use = 0;\n \t\treturn 0;\n \t}\n-\n+#endif\n \treturn 1;\n }\n \n void run_active_slot(struct active_request_slot *slot)\n {\n+#ifdef USE_CURL_MULTI\n \tint num_transfers;\n \tlong last_pos = 0;\n \tlong current_pos;\n@@ -255,6 +267,10 @@ void run_active_slot(struct active_reque\n \t\t\t       &excfds, &select_timeout);\n \t\t}\n \t}\n+#else\n+\tslot->curl_result = curl_easy_perform(slot->curl);\n+\tactive_requests--;\n+#endif\n }\n \n void start_request(struct transfer_request *request)\n@@ -356,7 +372,7 @@ void start_request(struct transfer_reque\n \t\t\t\t CURLOPT_HTTPHEADER, range_header);\n \t}\n \n-\t/* Try to add to multi handle, abort the request on error */\n+\t/* Try to get the request started, abort the request on error */\n \tif (!start_active_slot(slot)) {\n \t\trequest->state = ABORTED;\n \t\tclose(request->local);\n@@ -413,6 +429,7 @@ void release_request(struct transfer_req\n \tfree(request);\n }\n \n+#ifdef USE_CURL_MULTI\n void process_curl_messages()\n {\n \tint num_messages;\n@@ -478,6 +495,7 @@ void process_request_queue()\n \t\trequest = request->next;\n \t}\n }\n+#endif\n \n void prefetch(unsigned char *sha1)\n {\n@@ -505,8 +523,10 @@ void prefetch(unsigned char *sha1)\n \t\t}\n \t\ttail->next = newreq;\n \t}\n+#ifdef USE_CURL_MULTI\n \tprocess_request_queue();\n \tprocess_curl_messages();\n+#endif\n }\n \n static int got_alternates = 0;\n@@ -864,13 +884,14 @@ static int fetch_object(struct alt_base \n \tchar *hex = sha1_to_hex(sha1);\n \tint ret;\n \tstruct transfer_request *request = request_queue_head;\n-\tint num_transfers;\n \n \twhile (request != NULL && memcmp(request->sha1, sha1, 20))\n \t\trequest = request->next;\n \tif (request == NULL)\n \t\treturn error(\"Couldn't find request for %s in the queue\", hex);\n \n+#ifdef USE_CURL_MULTI\n+\tint num_transfers;\n \twhile (request->state == WAITING) {\n \t\tcurl_multi_perform(curlm, &num_transfers);\n \t\tif (num_transfers < active_requests) {\n@@ -878,9 +899,30 @@ static int fetch_object(struct alt_base \n \t\t\tprocess_request_queue();\n \t\t}\n \t}\n+#else\n+\tstart_request(request);\n+#endif\n \n-\tif (request->state == ACTIVE)\n+\twhile (request->state == ACTIVE) {\n \t\trun_active_slot(request->slot);\n+#ifndef USE_CURL_MULTI\n+\t\trequest->curl_result = request->slot->curl_result;\n+\t\tcurl_easy_getinfo(request->slot->curl,\n+\t\t\t\t  CURLINFO_HTTP_CODE,\n+\t\t\t\t  &request->http_code);\n+\t\trequest->slot = NULL;\n+\n+\t\t/* Use alternates if necessary */\n+\t\tif (request->http_code == 404 &&\n+\t\t    request->repo->next != NULL) {\n+\t\t\trequest->repo = request->repo->next;\n+\t\t\tstart_request(request);\n+\t\t} else {\n+\t\t\tfinish_request(request);\n+\t\t\trequest->state = COMPLETE;\n+\t\t}\n+#endif\n+\t}\n \n \tif (request->state == ABORTED) {\n \t\trelease_request(request);\n@@ -992,16 +1034,22 @@ int main(int argc, char **argv)\n \t\t\targ++;\n \t\t} else if (!strcmp(argv[arg], \"--recover\")) {\n \t\t\tget_recover = 1;\n+#ifdef USE_CURL_MULTI\n \t\t} else if (argv[arg][1] == 'r') {\n \t\t\tmax_requests = atoi(argv[arg + 1]);\n \t\t\tif (max_requests < 1)\n \t\t\t\tmax_requests = DEFAULT_MAX_REQUESTS;\n \t\t\targ++;\n+#endif\n \t\t}\n \t\targ++;\n \t}\n \tif (argc < arg + 2) {\n+#ifdef USE_CURL_MULTI\n+\t\tusage(\"git-http-fetch [-c] [-t] [-a] [-d] [-v] [-r concurrent-request-limit] [--recover] [-w ref] commit-id url\");\n+#else\n \t\tusage(\"git-http-fetch [-c] [-t] [-a] [-d] [-v] [--recover] [-w ref] commit-id url\");\n+#endif\n \t\treturn 1;\n \t}\n \tcommit_id = argv[arg];\n@@ -1009,11 +1057,13 @@ int main(int argc, char **argv)\n \n \tcurl_global_init(CURL_GLOBAL_ALL);\n \n+#ifdef USE_CURL_MULTI\n \tcurlm = curl_multi_init();\n \tif (curlm == NULL) {\n \t\tfprintf(stderr, \"Error creating curl multi handle.\\n\");\n \t\treturn 1;\n \t}\n+#endif\n \tno_pragma_header = curl_slist_append(no_pragma_header, \"Pragma:\");\n \tno_range_header = curl_slist_append(no_range_header, \"Range:\");\n \n@@ -1061,7 +1111,9 @@ int main(int argc, char **argv)\n \t\tcurl_easy_cleanup(slot->curl);\n \t\tslot = slot->next;\n \t}\n+#ifdef USE_CURL_MULTI\n \tcurl_multi_cleanup(curlm);\n+#endif\n \tcurl_global_cleanup();\n \treturn 0;\n }\n"}]}