[PATCH 2/3] Switched back to loading alternates as needed
Switched back to loading alternates as needed 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
f7eb290fa0620cebc033e80216c74ab9d1573a6c
1 file changed
+29
-16
http-fetch.c
+29
-16
@@ -25,6 +25,7 @@
25
#define PREV_BUF_SIZE 4096
26
#define RANGE_HEADER_SIZE 30
27
28
+static int got_alternates = 0;
29
static int active_requests = 0;
30
static int data_received;
31
@@ -85,6 +86,7 @@ struct active_request_slot
86
int in_use;
87
int done;
88
CURLcode curl_result;
89
+ long http_code;
90
struct active_request_slot *next;
91
};
92
@@ -235,6 +237,7 @@ static size_t fwrite_sha1_file(void *ptr, size_t eltsize, size_t nmemb,
237
static void process_curl_messages(void);
238
static void process_request_queue(void);
239
#endif
240
+static int fetch_alternates(char *base);
241
242
static CURL* get_curl_handle(void)
243
{
@@ -580,6 +583,9 @@ void process_curl_messages(void)
583
slot->done = 1;
584
slot->in_use = 0;
585
slot->curl_result = curl_message->data.result;
586
+ curl_easy_getinfo(slot->curl,
587
+ CURLINFO_HTTP_CODE,
588
+ &slot->http_code);
589
request = request_queue_head;
590
while (request != NULL &&
591
request->slot != slot)
@@ -590,19 +596,20 @@ void process_curl_messages(void)
596
if (request != NULL) {
597
request->curl_result =
598
curl_message->data.result;
593
- curl_easy_getinfo(slot->curl,
594
- CURLINFO_HTTP_CODE,
595
- &request->http_code);
599
+ request->http_code = slot->http_code;
600
request->slot = NULL;
601
+ request->state = COMPLETE;
602
603
/* Use alternates if necessary */
599
- if (request->http_code == 404 &&
600
- request->repo->next != NULL) {
601
- request->repo = request->repo->next;
602
- start_request(request);
604
+ if (request->http_code == 404) {
605
+ fetch_alternates(alt->base);
606
+ if (request->repo->next != NULL) {
607
+ request->repo =
608
+ request->repo->next;
609
+ start_request(request);
610
+ }
611
} else {
612
finish_request(request);
605
- request->state = COMPLETE;
613
}
614
}
615
} else {
@@ -765,6 +772,9 @@ static int fetch_alternates(char *base)
772
773
struct active_request_slot *slot;
774
775
+ if (got_alternates)
776
+ return 0;
777
+
778
data = xmalloc(4096);
779
buffer.size = 4096;
780
buffer.posn = 0;
@@ -797,6 +807,8 @@ static int fetch_alternates(char *base)
807
run_active_slot(slot);
808
if (slot->curl_result != CURLE_OK) {
809
free(buffer.buffer);
810
+ if (slot->http_code == 404)
811
+ got_alternates = 1;
812
return 0;
813
}
814
}
@@ -868,6 +880,7 @@ static int fetch_alternates(char *base)
880
i = posn + 1;
881
}
882
883
+ got_alternates = 1;
884
free(buffer.buffer);
885
return ret;
886
}
@@ -1059,16 +1072,16 @@ static int fetch_object(struct alt_base *repo, unsigned char *sha1)
1072
run_active_slot(request->slot);
1073
#ifndef USE_CURL_MULTI
1074
request->curl_result = request->slot->curl_result;
1062
- curl_easy_getinfo(request->slot->curl,
1063
- CURLINFO_HTTP_CODE,
1064
- &request->http_code);
1075
+ request->http_code = request->slot->http_code;
1076
request->slot = NULL;
1077
1078
/* Use alternates if necessary */
1068
- if (request->http_code == 404 &&
1069
- request->repo->next != NULL) {
1070
- request->repo = request->repo->next;
1071
- start_request(request);
1079
+ if (request->http_code == 404) {
1080
+ fetch_alternates(alt->base);
1081
+ if (request->repo->next != NULL) {
1082
+ request->repo = request->repo->next;
1083
+ start_request(request);
1084
+ }
1085
} else {
1086
finish_request(request);
1087
request->state = COMPLETE;
@@ -1121,6 +1134,7 @@ int fetch(unsigned char *sha1)
1134
while (altbase) {
1135
if (!fetch_pack(altbase, sha1))
1136
return 0;
1137
+ fetch_alternates(alt->base);
1138
altbase = altbase->next;
1139
}
1140
return error("Unable to find %s under %s\n", sha1_to_hex(sha1),
@@ -1297,7 +1311,6 @@ int main(int argc, char **argv)
1311
alt->got_indices = 0;
1312
alt->packs = NULL;
1313
alt->next = NULL;
1300
- fetch_alternates(alt->base);
1314
1315
if (pull(commit_id))
1316
return 1;