Skip to content
Newer
Older
100644 592 lines (509 sloc) 13.9 KB
6eb7ed5 [PATCH] Various transport programs
Daniel Barkalow authored
1 #include "cache.h"
2 #include "commit.h"
30ae764 Modularize commit-walker
Daniel Barkalow authored
3 #include "walker.h"
29508e1 Isolate shared HTTP request functionality
Nick Hengeveld authored
4 #include "http.h"
7baa3e8 @dscho Some curl versions lack curl_easy_duphandle()
dscho authored
5
9cba13c @jrn standardize brace placement in struct definitions
jrn authored
6 struct alt_base {
2afea3b http-fetch: don't use double-slash as directory separator in URLs
Gerrit Pape authored
7 char *base;
b366156 [PATCH] Add support for alternates in HTTP
Daniel Barkalow authored
8 int got_indices;
9 struct packed_git *packs;
10 struct alt_base *next;
11 };
12
e388ab7 Make http-fetch request types more clear
Nick Hengeveld authored
13 enum object_request_state {
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
14 WAITING,
15 ABORTED,
16 ACTIVE,
4b05548 enums: omit trailing comma for portability
Gary V. Vaughan authored
17 COMPLETE
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
18 };
6eb7ed5 [PATCH] Various transport programs
Daniel Barkalow authored
19
9cba13c @jrn standardize brace placement in struct definitions
jrn authored
20 struct object_request {
30ae764 Modularize commit-walker
Daniel Barkalow authored
21 struct walker *walker;
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
22 unsigned char sha1[20];
23 struct alt_base *repo;
e388ab7 Make http-fetch request types more clear
Nick Hengeveld authored
24 enum object_request_state state;
5424bc5 @rctay http*: add helper methods for fetching objects (loose)
rctay authored
25 struct http_object_request *req;
e388ab7 Make http-fetch request types more clear
Nick Hengeveld authored
26 struct object_request *next;
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
27 };
28
e388ab7 Make http-fetch request types more clear
Nick Hengeveld authored
29 struct alternates_request {
30ae764 Modularize commit-walker
Daniel Barkalow authored
30 struct walker *walker;
8e29f6a Teach git-http-fetch the --stdin switch
Petr Baudis authored
31 const char *base;
acc075a Fix for multiple alternates requests in http-fetch
Nick Hengeveld authored
32 char *url;
028c297 @glandium Use strbuf in http code
glandium authored
33 struct strbuf *buffer;
acc075a Fix for multiple alternates requests in http-fetch
Nick Hengeveld authored
34 struct active_request_slot *slot;
35 int http_specific;
36 };
37
30ae764 Modularize commit-walker
Daniel Barkalow authored
38 struct walker_data {
39 const char *url;
40 int got_alternates;
41 struct alt_base *alt;
42 };
43
96f1e58 remove unnecessary initializations
David Rientjes authored
44 static struct object_request *object_queue_head;
bc8f265 @sigprof git-http-fetch: Remove size limit for objects/info/{packs,alternates}
sigprof authored
45
30ae764 Modularize commit-walker
Daniel Barkalow authored
46 static void fetch_alternates(struct walker *walker, const char *base);
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
47
29508e1 Isolate shared HTTP request functionality
Nick Hengeveld authored
48 static void process_object_response(void *callback_data);
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
49
30ae764 Modularize commit-walker
Daniel Barkalow authored
50 static void start_object_request(struct walker *walker,
51 struct object_request *obj_req)
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
52 {
53 struct active_request_slot *slot;
5424bc5 @rctay http*: add helper methods for fetching objects (loose)
rctay authored
54 struct http_object_request *req;
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
55
5424bc5 @rctay http*: add helper methods for fetching objects (loose)
rctay authored
56 req = new_http_object_request(obj_req->repo->base, obj_req->sha1);
57 if (req == NULL) {
e388ab7 Make http-fetch request types more clear
Nick Hengeveld authored
58 obj_req->state = ABORTED;
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
59 return;
60 }
5424bc5 @rctay http*: add helper methods for fetching objects (loose)
rctay authored
61 obj_req->req = req;
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
62
5424bc5 @rctay http*: add helper methods for fetching objects (loose)
rctay authored
63 slot = req->slot;
29508e1 Isolate shared HTTP request functionality
Nick Hengeveld authored
64 slot->callback_func = process_object_response;
e388ab7 Make http-fetch request types more clear
Nick Hengeveld authored
65 slot->callback_data = obj_req;
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
66
a7a8d37 Only compile parallel HTTP support with CURL >= 7.9.8
Nick Hengeveld authored
67 /* Try to get the request started, abort the request on error */
e388ab7 Make http-fetch request types more clear
Nick Hengeveld authored
68 obj_req->state = ACTIVE;
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
69 if (!start_active_slot(slot)) {
e388ab7 Make http-fetch request types more clear
Nick Hengeveld authored
70 obj_req->state = ABORTED;
5424bc5 @rctay http*: add helper methods for fetching objects (loose)
rctay authored
71 release_http_object_request(req);
e388ab7 Make http-fetch request types more clear
Nick Hengeveld authored
72 return;
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
73 }
74 }
75
e388ab7 Make http-fetch request types more clear
Nick Hengeveld authored
76 static void finish_object_request(struct object_request *obj_req)
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
77 {
5424bc5 @rctay http*: add helper methods for fetching objects (loose)
rctay authored
78 if (finish_http_object_request(obj_req->req))
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
79 return;
80
5424bc5 @rctay http*: add helper methods for fetching objects (loose)
rctay authored
81 if (obj_req->req->rename == 0)
30ae764 Modularize commit-walker
Daniel Barkalow authored
82 walker_say(obj_req->walker, "got %s\n", sha1_to_hex(obj_req->sha1));
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
83 }
84
29508e1 Isolate shared HTTP request functionality
Nick Hengeveld authored
85 static void process_object_response(void *callback_data)
86 {
e388ab7 Make http-fetch request types more clear
Nick Hengeveld authored
87 struct object_request *obj_req =
88 (struct object_request *)callback_data;
30ae764 Modularize commit-walker
Daniel Barkalow authored
89 struct walker *walker = obj_req->walker;
90 struct walker_data *data = walker->data;
91 struct alt_base *alt = data->alt;
29508e1 Isolate shared HTTP request functionality
Nick Hengeveld authored
92
5424bc5 @rctay http*: add helper methods for fetching objects (loose)
rctay authored
93 process_http_object_request(obj_req->req);
e388ab7 Make http-fetch request types more clear
Nick Hengeveld authored
94 obj_req->state = COMPLETE;
29508e1 Isolate shared HTTP request functionality
Nick Hengeveld authored
95
96 /* Use alternates if necessary */
5424bc5 @rctay http*: add helper methods for fetching objects (loose)
rctay authored
97 if (missing_target(obj_req->req)) {
30ae764 Modularize commit-walker
Daniel Barkalow authored
98 fetch_alternates(walker, alt->base);
e388ab7 Make http-fetch request types more clear
Nick Hengeveld authored
99 if (obj_req->repo->next != NULL) {
100 obj_req->repo =
101 obj_req->repo->next;
5424bc5 @rctay http*: add helper methods for fetching objects (loose)
rctay authored
102 release_http_object_request(obj_req->req);
30ae764 Modularize commit-walker
Daniel Barkalow authored
103 start_object_request(walker, obj_req);
29508e1 Isolate shared HTTP request functionality
Nick Hengeveld authored
104 return;
105 }
106 }
107
e388ab7 Make http-fetch request types more clear
Nick Hengeveld authored
108 finish_object_request(obj_req);
29508e1 Isolate shared HTTP request functionality
Nick Hengeveld authored
109 }
110
e388ab7 Make http-fetch request types more clear
Nick Hengeveld authored
111 static void release_object_request(struct object_request *obj_req)
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
112 {
e388ab7 Make http-fetch request types more clear
Nick Hengeveld authored
113 struct object_request *entry = object_queue_head;
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
114
5424bc5 @rctay http*: add helper methods for fetching objects (loose)
rctay authored
115 if (obj_req->req !=NULL && obj_req->req->localfile != -1)
116 error("fd leakage in release: %d", obj_req->req->localfile);
e388ab7 Make http-fetch request types more clear
Nick Hengeveld authored
117 if (obj_req == object_queue_head) {
118 object_queue_head = obj_req->next;
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
119 } else {
e388ab7 Make http-fetch request types more clear
Nick Hengeveld authored
120 while (entry->next != NULL && entry->next != obj_req)
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
121 entry = entry->next;
e388ab7 Make http-fetch request types more clear
Nick Hengeveld authored
122 if (entry->next == obj_req)
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
123 entry->next = entry->next->next;
124 }
125
e388ab7 Make http-fetch request types more clear
Nick Hengeveld authored
126 free(obj_req);
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
127 }
128
a7a8d37 Only compile parallel HTTP support with CURL >= 7.9.8
Nick Hengeveld authored
129 #ifdef USE_CURL_MULTI
30ae764 Modularize commit-walker
Daniel Barkalow authored
130 static int fill_active_slot(struct walker *walker)
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
131 {
45c1741 Refactor http.h USE_CURL_MULTI fill_active_slots().
Daniel Barkalow authored
132 struct object_request *obj_req;
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
133
45c1741 Refactor http.h USE_CURL_MULTI fill_active_slots().
Daniel Barkalow authored
134 for (obj_req = object_queue_head; obj_req; obj_req = obj_req->next) {
e388ab7 Make http-fetch request types more clear
Nick Hengeveld authored
135 if (obj_req->state == WAITING) {
136 if (has_sha1_file(obj_req->sha1))
09db444 @distorted-mdw http-fetch: Fix object list corruption in fill_active_slots().
distorted-mdw authored
137 obj_req->state = COMPLETE;
45c1741 Refactor http.h USE_CURL_MULTI fill_active_slots().
Daniel Barkalow authored
138 else {
30ae764 Modularize commit-walker
Daniel Barkalow authored
139 start_object_request(walker, obj_req);
45c1741 Refactor http.h USE_CURL_MULTI fill_active_slots().
Daniel Barkalow authored
140 return 1;
141 }
f1a906a [PATCH 1/3] Clean up CURL handles in unused request slots
Nick Hengeveld authored
142 }
8fcf7f9 whitespace cleanup.
Junio C Hamano authored
143 }
45c1741 Refactor http.h USE_CURL_MULTI fill_active_slots().
Daniel Barkalow authored
144 return 0;
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
145 }
a7a8d37 Only compile parallel HTTP support with CURL >= 7.9.8
Nick Hengeveld authored
146 #endif
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
147
30ae764 Modularize commit-walker
Daniel Barkalow authored
148 static void prefetch(struct walker *walker, unsigned char *sha1)
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
149 {
e388ab7 Make http-fetch request types more clear
Nick Hengeveld authored
150 struct object_request *newreq;
151 struct object_request *tail;
30ae764 Modularize commit-walker
Daniel Barkalow authored
152 struct walker_data *data = walker->data;
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
153
154 newreq = xmalloc(sizeof(*newreq));
30ae764 Modularize commit-walker
Daniel Barkalow authored
155 newreq->walker = walker;
e702496 @spearce Convert memcpy(a,b,20) to hashcpy(a,b).
spearce authored
156 hashcpy(newreq->sha1, sha1);
30ae764 Modularize commit-walker
Daniel Barkalow authored
157 newreq->repo = data->alt;
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
158 newreq->state = WAITING;
5424bc5 @rctay http*: add helper methods for fetching objects (loose)
rctay authored
159 newreq->req = NULL;
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
160 newreq->next = NULL;
161
e917674 @rctay http*: move common variables and macros to http.[ch]
rctay authored
162 http_is_verbose = walker->get_verbosely;
163
e388ab7 Make http-fetch request types more clear
Nick Hengeveld authored
164 if (object_queue_head == NULL) {
165 object_queue_head = newreq;
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
166 } else {
e388ab7 Make http-fetch request types more clear
Nick Hengeveld authored
167 tail = object_queue_head;
4c42aa1 @rctay http-push, http-walker: style fixes
rctay authored
168 while (tail->next != NULL)
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
169 tail = tail->next;
170 tail->next = newreq;
171 }
29508e1 Isolate shared HTTP request functionality
Nick Hengeveld authored
172
a7a8d37 Only compile parallel HTTP support with CURL >= 7.9.8
Nick Hengeveld authored
173 #ifdef USE_CURL_MULTI
29508e1 Isolate shared HTTP request functionality
Nick Hengeveld authored
174 fill_active_slots();
175 step_active_slots();
a7a8d37 Only compile parallel HTTP support with CURL >= 7.9.8
Nick Hengeveld authored
176 #endif
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
177 }
178
e388ab7 Make http-fetch request types more clear
Nick Hengeveld authored
179 static void process_alternates_response(void *callback_data)
b366156 [PATCH] Add support for alternates in HTTP
Daniel Barkalow authored
180 {
e388ab7 Make http-fetch request types more clear
Nick Hengeveld authored
181 struct alternates_request *alt_req =
182 (struct alternates_request *)callback_data;
30ae764 Modularize commit-walker
Daniel Barkalow authored
183 struct walker *walker = alt_req->walker;
184 struct walker_data *cdata = walker->data;
acc075a Fix for multiple alternates requests in http-fetch
Nick Hengeveld authored
185 struct active_request_slot *slot = alt_req->slot;
30ae764 Modularize commit-walker
Daniel Barkalow authored
186 struct alt_base *tail = cdata->alt;
8e29f6a Teach git-http-fetch the --stdin switch
Petr Baudis authored
187 const char *base = alt_req->base;
a04ff3e @toofishes http: make curl callbacks match contracts from curl header
toofishes authored
188 const char null_byte = '\0';
acc075a Fix for multiple alternates requests in http-fetch
Nick Hengeveld authored
189 char *data;
190 int i = 0;
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
191
acc075a Fix for multiple alternates requests in http-fetch
Nick Hengeveld authored
192 if (alt_req->http_specific) {
193 if (slot->curl_result != CURLE_OK ||
028c297 @glandium Use strbuf in http code
glandium authored
194 !alt_req->buffer->len) {
acc075a Fix for multiple alternates requests in http-fetch
Nick Hengeveld authored
195
196 /* Try reusing the slot to get non-http alternates */
197 alt_req->http_specific = 0;
198 sprintf(alt_req->url, "%s/objects/info/alternates",
199 base);
200 curl_easy_setopt(slot->curl, CURLOPT_URL,
201 alt_req->url);
202 active_requests++;
203 slot->in_use = 1;
c982647 Fix broken slot reuse when fetching alternates
Nick Hengeveld authored
204 if (slot->finished != NULL)
205 (*slot->finished) = 0;
a3f583c @distorted-mdw http-fetch: Tidy control flow in process_alternate_response
distorted-mdw authored
206 if (!start_active_slot(slot)) {
30ae764 Modularize commit-walker
Daniel Barkalow authored
207 cdata->got_alternates = -1;
29508e1 Isolate shared HTTP request functionality
Nick Hengeveld authored
208 slot->in_use = 0;
c982647 Fix broken slot reuse when fetching alternates
Nick Hengeveld authored
209 if (slot->finished != NULL)
210 (*slot->finished) = 1;
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
211 }
a3f583c @distorted-mdw http-fetch: Tidy control flow in process_alternate_response
distorted-mdw authored
212 return;
b366156 [PATCH] Add support for alternates in HTTP
Daniel Barkalow authored
213 }
acc075a Fix for multiple alternates requests in http-fetch
Nick Hengeveld authored
214 } else if (slot->curl_result != CURLE_OK) {
be4a015 http-fetch.c: consolidate code to detect missing fetch target
Junio C Hamano authored
215 if (!missing_target(slot)) {
30ae764 Modularize commit-walker
Daniel Barkalow authored
216 cdata->got_alternates = -1;
acc075a Fix for multiple alternates requests in http-fetch
Nick Hengeveld authored
217 return;
218 }
b366156 [PATCH] Add support for alternates in HTTP
Daniel Barkalow authored
219 }
220
a04ff3e @toofishes http: make curl callbacks match contracts from curl header
toofishes authored
221 fwrite_buffer((char *)&null_byte, 1, 1, alt_req->buffer);
028c297 @glandium Use strbuf in http code
glandium authored
222 alt_req->buffer->len--;
223 data = alt_req->buffer->buf;
1b0c1e6 [PATCH] Support alternates and http-alternates in http-fetch
Daniel Barkalow authored
224
028c297 @glandium Use strbuf in http code
glandium authored
225 while (i < alt_req->buffer->len) {
b366156 [PATCH] Add support for alternates in HTTP
Daniel Barkalow authored
226 int posn = i;
028c297 @glandium Use strbuf in http code
glandium authored
227 while (posn < alt_req->buffer->len && data[posn] != '\n')
b366156 [PATCH] Add support for alternates in HTTP
Daniel Barkalow authored
228 posn++;
229 if (data[posn] == '\n') {
1b0c1e6 [PATCH] Support alternates and http-alternates in http-fetch
Daniel Barkalow authored
230 int okay = 0;
231 int serverlen = 0;
232 struct alt_base *newalt;
233 char *target = NULL;
b366156 [PATCH] Add support for alternates in HTTP
Daniel Barkalow authored
234 if (data[i] == '/') {
4c42aa1 @rctay http-push, http-walker: style fixes
rctay authored
235 /*
236 * This counts
5df1e0d http-fetch: fix alternates handling.
Junio C Hamano authored
237 * http://git.host/pub/scm/linux.git/
238 * -----------here^
239 * so memcpy(dst, base, serverlen) will
240 * copy up to "...git.host".
241 */
242 const char *colon_ss = strstr(base,"://");
243 if (colon_ss) {
244 serverlen = (strchr(colon_ss + 3, '/')
245 - base);
246 okay = 1;
247 }
1b0c1e6 [PATCH] Support alternates and http-alternates in http-fetch
Daniel Barkalow authored
248 } else if (!memcmp(data + i, "../", 3)) {
4c42aa1 @rctay http-push, http-walker: style fixes
rctay authored
249 /*
250 * Relative URL; chop the corresponding
5df1e0d http-fetch: fix alternates handling.
Junio C Hamano authored
251 * number of subpath from base (and ../
252 * from data), and concatenate the result.
253 *
254 * The code first drops ../ from data, and
255 * then drops one ../ from data and one path
256 * from base. IOW, one extra ../ is dropped
257 * from data than path is dropped from base.
258 *
259 * This is not wrong. The alternate in
260 * http://git.host/pub/scm/linux.git/
261 * to borrow from
262 * http://git.host/pub/scm/linus.git/
263 * is ../../linus.git/objects/. You need
264 * two ../../ to borrow from your direct
265 * neighbour.
266 */
1b0c1e6 [PATCH] Support alternates and http-alternates in http-fetch
Daniel Barkalow authored
267 i += 3;
268 serverlen = strlen(base);
8fcf7f9 whitespace cleanup.
Junio C Hamano authored
269 while (i + 2 < posn &&
1b0c1e6 [PATCH] Support alternates and http-alternates in http-fetch
Daniel Barkalow authored
270 !memcmp(data + i, "../", 3)) {
271 do {
272 serverlen--;
273 } while (serverlen &&
274 base[serverlen - 1] != '/');
275 i += 3;
276 }
a9486b0 @proski Avoid C99 comments, use old-style C comments instead.
proski authored
277 /* If the server got removed, give up. */
8fcf7f9 whitespace cleanup.
Junio C Hamano authored
278 okay = strchr(base, ':') - base + 3 <
4c42aa1 @rctay http-push, http-walker: style fixes
rctay authored
279 serverlen;
acc075a Fix for multiple alternates requests in http-fetch
Nick Hengeveld authored
280 } else if (alt_req->http_specific) {
1b0c1e6 [PATCH] Support alternates and http-alternates in http-fetch
Daniel Barkalow authored
281 char *colon = strchr(data + i, ':');
282 char *slash = strchr(data + i, '/');
283 if (colon && slash && colon < data + posn &&
284 slash < data + posn && colon < slash) {
285 okay = 1;
286 }
287 }
5df1e0d http-fetch: fix alternates handling.
Junio C Hamano authored
288 /* skip "objects\n" at end */
1b0c1e6 [PATCH] Support alternates and http-alternates in http-fetch
Daniel Barkalow authored
289 if (okay) {
290 target = xmalloc(serverlen + posn - i - 6);
5df1e0d http-fetch: fix alternates handling.
Junio C Hamano authored
291 memcpy(target, base, serverlen);
292 memcpy(target + serverlen, data + i,
293 posn - i - 7);
294 target[serverlen + posn - i - 7] = 0;
30ae764 Modularize commit-walker
Daniel Barkalow authored
295 if (walker->get_verbosely)
8fcf7f9 whitespace cleanup.
Junio C Hamano authored
296 fprintf(stderr,
b366156 [PATCH] Add support for alternates in HTTP
Daniel Barkalow authored
297 "Also look at %s\n", target);
298 newalt = xmalloc(sizeof(*newalt));
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
299 newalt->next = NULL;
b366156 [PATCH] Add support for alternates in HTTP
Daniel Barkalow authored
300 newalt->base = target;
301 newalt->got_indices = 0;
302 newalt->packs = NULL;
8d9fbe5 http-fetch: add optional DAV-based pack list
Nick Hengeveld authored
303
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
304 while (tail->next != NULL)
305 tail = tail->next;
306 tail->next = newalt;
b366156 [PATCH] Add support for alternates in HTTP
Daniel Barkalow authored
307 }
308 }
309 i = posn + 1;
310 }
bc8f265 @sigprof git-http-fetch: Remove size limit for objects/info/{packs,alternates}
sigprof authored
311
30ae764 Modularize commit-walker
Daniel Barkalow authored
312 cdata->got_alternates = 1;
acc075a Fix for multiple alternates requests in http-fetch
Nick Hengeveld authored
313 }
314
30ae764 Modularize commit-walker
Daniel Barkalow authored
315 static void fetch_alternates(struct walker *walker, const char *base)
acc075a Fix for multiple alternates requests in http-fetch
Nick Hengeveld authored
316 {
028c297 @glandium Use strbuf in http code
glandium authored
317 struct strbuf buffer = STRBUF_INIT;
acc075a Fix for multiple alternates requests in http-fetch
Nick Hengeveld authored
318 char *url;
319 struct active_request_slot *slot;
cb754fd Use local structs for HTTP slot callback data
Nick Hengeveld authored
320 struct alternates_request alt_req;
30ae764 Modularize commit-walker
Daniel Barkalow authored
321 struct walker_data *cdata = walker->data;
acc075a Fix for multiple alternates requests in http-fetch
Nick Hengeveld authored
322
4c42aa1 @rctay http-push, http-walker: style fixes
rctay authored
323 /*
324 * If another request has already started fetching alternates,
325 * wait for them to arrive and return to processing this request's
326 * curl message
327 */
29508e1 Isolate shared HTTP request functionality
Nick Hengeveld authored
328 #ifdef USE_CURL_MULTI
30ae764 Modularize commit-walker
Daniel Barkalow authored
329 while (cdata->got_alternates == 0) {
29508e1 Isolate shared HTTP request functionality
Nick Hengeveld authored
330 step_active_slots();
acc075a Fix for multiple alternates requests in http-fetch
Nick Hengeveld authored
331 }
29508e1 Isolate shared HTTP request functionality
Nick Hengeveld authored
332 #endif
acc075a Fix for multiple alternates requests in http-fetch
Nick Hengeveld authored
333
334 /* Nothing to do if they've already been fetched */
30ae764 Modularize commit-walker
Daniel Barkalow authored
335 if (cdata->got_alternates == 1)
acc075a Fix for multiple alternates requests in http-fetch
Nick Hengeveld authored
336 return;
337
338 /* Start the fetch */
30ae764 Modularize commit-walker
Daniel Barkalow authored
339 cdata->got_alternates = 0;
acc075a Fix for multiple alternates requests in http-fetch
Nick Hengeveld authored
340
30ae764 Modularize commit-walker
Daniel Barkalow authored
341 if (walker->get_verbosely)
acc075a Fix for multiple alternates requests in http-fetch
Nick Hengeveld authored
342 fprintf(stderr, "Getting alternates list for %s\n", base);
8fcf7f9 whitespace cleanup.
Junio C Hamano authored
343
acc075a Fix for multiple alternates requests in http-fetch
Nick Hengeveld authored
344 url = xmalloc(strlen(base) + 31);
345 sprintf(url, "%s/objects/info/http-alternates", base);
346
4c42aa1 @rctay http-push, http-walker: style fixes
rctay authored
347 /*
348 * Use a callback to process the result, since another request
349 * may fail and need to have alternates loaded before continuing
350 */
acc075a Fix for multiple alternates requests in http-fetch
Nick Hengeveld authored
351 slot = get_active_slot();
e388ab7 Make http-fetch request types more clear
Nick Hengeveld authored
352 slot->callback_func = process_alternates_response;
30ae764 Modularize commit-walker
Daniel Barkalow authored
353 alt_req.walker = walker;
acc075a Fix for multiple alternates requests in http-fetch
Nick Hengeveld authored
354 slot->callback_data = &alt_req;
355
356 curl_easy_setopt(slot->curl, CURLOPT_FILE, &buffer);
29508e1 Isolate shared HTTP request functionality
Nick Hengeveld authored
357 curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer);
acc075a Fix for multiple alternates requests in http-fetch
Nick Hengeveld authored
358 curl_easy_setopt(slot->curl, CURLOPT_URL, url);
359
360 alt_req.base = base;
361 alt_req.url = url;
362 alt_req.buffer = &buffer;
363 alt_req.http_specific = 1;
364 alt_req.slot = slot;
365
366 if (start_active_slot(slot))
367 run_active_slot(slot);
368 else
30ae764 Modularize commit-walker
Daniel Barkalow authored
369 cdata->got_alternates = -1;
acc075a Fix for multiple alternates requests in http-fetch
Nick Hengeveld authored
370
028c297 @glandium Use strbuf in http code
glandium authored
371 strbuf_release(&buffer);
acc075a Fix for multiple alternates requests in http-fetch
Nick Hengeveld authored
372 free(url);
b366156 [PATCH] Add support for alternates in HTTP
Daniel Barkalow authored
373 }
374
30ae764 Modularize commit-walker
Daniel Barkalow authored
375 static int fetch_indices(struct walker *walker, struct alt_base *repo)
182005b [PATCH] Support downloading packs by HTTP (whitespace fixed)
barkalow@iabervon.org authored
376 {
b8caac2 @rctay http*: add http_get_info_packs
rctay authored
377 int ret;
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
378
b366156 [PATCH] Add support for alternates in HTTP
Daniel Barkalow authored
379 if (repo->got_indices)
182005b [PATCH] Support downloading packs by HTTP (whitespace fixed)
barkalow@iabervon.org authored
380 return 0;
381
30ae764 Modularize commit-walker
Daniel Barkalow authored
382 if (walker->get_verbosely)
6fd72e3 Show URL in the "Getting <foo> list" http-fetch messages
Petr Baudis authored
383 fprintf(stderr, "Getting pack list for %s\n", repo->base);
8fcf7f9 whitespace cleanup.
Junio C Hamano authored
384
b8caac2 @rctay http*: add http_get_info_packs
rctay authored
385 switch (http_get_info_packs(repo->base, &repo->packs)) {
386 case HTTP_OK:
387 case HTTP_MISSING_TARGET:
388 repo->got_indices = 1;
389 ret = 0;
390 break;
391 default:
5e3a769 Improve pack list response handling
Nick Hengeveld authored
392 repo->got_indices = 0;
b8caac2 @rctay http*: add http_get_info_packs
rctay authored
393 ret = -1;
b366156 [PATCH] Add support for alternates in HTTP
Daniel Barkalow authored
394 }
182005b [PATCH] Support downloading packs by HTTP (whitespace fixed)
barkalow@iabervon.org authored
395
3a462bc @glandium Fix various memory leaks in http-push.c and http-walker.c
glandium authored
396 return ret;
182005b [PATCH] Support downloading packs by HTTP (whitespace fixed)
barkalow@iabervon.org authored
397 }
398
30ae764 Modularize commit-walker
Daniel Barkalow authored
399 static int fetch_pack(struct walker *walker, struct alt_base *repo, unsigned char *sha1)
182005b [PATCH] Support downloading packs by HTTP (whitespace fixed)
barkalow@iabervon.org authored
400 {
401 struct packed_git *target;
49a0f24 [PATCH] HTTP partial transfer support for object, pack, and index tra…
Nick Hengeveld authored
402 int ret;
cb754fd Use local structs for HTTP slot callback data
Nick Hengeveld authored
403 struct slot_results results;
2264dfa @rctay http*: add helper methods for fetching packs
rctay authored
404 struct http_pack_request *preq;
182005b [PATCH] Support downloading packs by HTTP (whitespace fixed)
barkalow@iabervon.org authored
405
30ae764 Modularize commit-walker
Daniel Barkalow authored
406 if (fetch_indices(walker, repo))
182005b [PATCH] Support downloading packs by HTTP (whitespace fixed)
barkalow@iabervon.org authored
407 return -1;
b366156 [PATCH] Add support for alternates in HTTP
Daniel Barkalow authored
408 target = find_sha1_pack(sha1, repo->packs);
182005b [PATCH] Support downloading packs by HTTP (whitespace fixed)
barkalow@iabervon.org authored
409 if (!target)
b366156 [PATCH] Add support for alternates in HTTP
Daniel Barkalow authored
410 return -1;
182005b [PATCH] Support downloading packs by HTTP (whitespace fixed)
barkalow@iabervon.org authored
411
30ae764 Modularize commit-walker
Daniel Barkalow authored
412 if (walker->get_verbosely) {
182005b [PATCH] Support downloading packs by HTTP (whitespace fixed)
barkalow@iabervon.org authored
413 fprintf(stderr, "Getting pack %s\n",
414 sha1_to_hex(target->sha1));
415 fprintf(stderr, " which contains %s\n",
416 sha1_to_hex(sha1));
417 }
418
2264dfa @rctay http*: add helper methods for fetching packs
rctay authored
419 preq = new_http_pack_request(target, repo->base);
420 if (preq == NULL)
421 goto abort;
422 preq->lst = &repo->packs;
423 preq->slot->results = &results;
182005b [PATCH] Support downloading packs by HTTP (whitespace fixed)
barkalow@iabervon.org authored
424
2264dfa @rctay http*: add helper methods for fetching packs
rctay authored
425 if (start_active_slot(preq->slot)) {
426 run_active_slot(preq->slot);
c8568e1 Fix HTTP request result processing after slot reuse
Nick Hengeveld authored
427 if (results.curl_result != CURLE_OK) {
2264dfa @rctay http*: add helper methods for fetching packs
rctay authored
428 error("Unable to get pack file %s\n%s", preq->url,
429 curl_errorstr);
430 goto abort;
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
431 }
432 } else {
2264dfa @rctay http*: add helper methods for fetching packs
rctay authored
433 error("Unable to start request");
434 goto abort;
182005b [PATCH] Support downloading packs by HTTP (whitespace fixed)
barkalow@iabervon.org authored
435 }
436
2264dfa @rctay http*: add helper methods for fetching packs
rctay authored
437 ret = finish_http_pack_request(preq);
438 release_http_pack_request(preq);
49a0f24 [PATCH] HTTP partial transfer support for object, pack, and index tra…
Nick Hengeveld authored
439 if (ret)
b721e01 Use the same move_temp_to_file in git-http-fetch.
Junio C Hamano authored
440 return ret;
49a0f24 [PATCH] HTTP partial transfer support for object, pack, and index tra…
Nick Hengeveld authored
441
182005b [PATCH] Support downloading packs by HTTP (whitespace fixed)
barkalow@iabervon.org authored
442 return 0;
2264dfa @rctay http*: add helper methods for fetching packs
rctay authored
443
444 abort:
445 return -1;
182005b [PATCH] Support downloading packs by HTTP (whitespace fixed)
barkalow@iabervon.org authored
446 }
447
53f3138 @distorted-mdw http-fetch: Abort requests for objects which arrived in packs
distorted-mdw authored
448 static void abort_object_request(struct object_request *obj_req)
449 {
450 release_object_request(obj_req);
451 }
452
30ae764 Modularize commit-walker
Daniel Barkalow authored
453 static int fetch_object(struct walker *walker, struct alt_base *repo, unsigned char *sha1)
6eb7ed5 [PATCH] Various transport programs
Daniel Barkalow authored
454 {
455 char *hex = sha1_to_hex(sha1);
29508e1 Isolate shared HTTP request functionality
Nick Hengeveld authored
456 int ret = 0;
e388ab7 Make http-fetch request types more clear
Nick Hengeveld authored
457 struct object_request *obj_req = object_queue_head;
5424bc5 @rctay http*: add helper methods for fetching objects (loose)
rctay authored
458 struct http_object_request *req;
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
459
a89fccd Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.
David Rientjes authored
460 while (obj_req != NULL && hashcmp(obj_req->sha1, sha1))
e388ab7 Make http-fetch request types more clear
Nick Hengeveld authored
461 obj_req = obj_req->next;
462 if (obj_req == NULL)
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
463 return error("Couldn't find request for %s in the queue", hex);
464
e388ab7 Make http-fetch request types more clear
Nick Hengeveld authored
465 if (has_sha1_file(obj_req->sha1)) {
5424bc5 @rctay http*: add helper methods for fetching objects (loose)
rctay authored
466 if (obj_req->req != NULL)
467 abort_http_object_request(obj_req->req);
53f3138 @distorted-mdw http-fetch: Abort requests for objects which arrived in packs
distorted-mdw authored
468 abort_object_request(obj_req);
11f0daf [PATCH] Don't fetch objects that exist in the local repository
Nick Hengeveld authored
469 return 0;
470 }
471
a7a8d37 Only compile parallel HTTP support with CURL >= 7.9.8
Nick Hengeveld authored
472 #ifdef USE_CURL_MULTI
4c42aa1 @rctay http-push, http-walker: style fixes
rctay authored
473 while (obj_req->state == WAITING)
29508e1 Isolate shared HTTP request functionality
Nick Hengeveld authored
474 step_active_slots();
a7a8d37 Only compile parallel HTTP support with CURL >= 7.9.8
Nick Hengeveld authored
475 #else
30ae764 Modularize commit-walker
Daniel Barkalow authored
476 start_object_request(walker, obj_req);
a7a8d37 Only compile parallel HTTP support with CURL >= 7.9.8
Nick Hengeveld authored
477 #endif
6eb7ed5 [PATCH] Various transport programs
Daniel Barkalow authored
478
5424bc5 @rctay http*: add helper methods for fetching objects (loose)
rctay authored
479 /*
480 * obj_req->req might change when fetching alternates in the callback
481 * process_object_response; therefore, the "shortcut" variable, req,
482 * is used only after we're done with slots.
483 */
4c42aa1 @rctay http-push, http-walker: style fixes
rctay authored
484 while (obj_req->state == ACTIVE)
5424bc5 @rctay http*: add helper methods for fetching objects (loose)
rctay authored
485 run_active_slot(obj_req->req->slot);
486
487 req = obj_req->req;
4c42aa1 @rctay http-push, http-walker: style fixes
rctay authored
488
5424bc5 @rctay http*: add helper methods for fetching objects (loose)
rctay authored
489 if (req->localfile != -1) {
490 close(req->localfile);
491 req->localfile = -1;
313c471 Fix bunch of fd leaks in http-fetch
Petr Baudis authored
492 }
6eb7ed5 [PATCH] Various transport programs
Daniel Barkalow authored
493
e388ab7 Make http-fetch request types more clear
Nick Hengeveld authored
494 if (obj_req->state == ABORTED) {
29508e1 Isolate shared HTTP request functionality
Nick Hengeveld authored
495 ret = error("Request for %s aborted", hex);
5424bc5 @rctay http*: add helper methods for fetching objects (loose)
rctay authored
496 } else if (req->curl_result != CURLE_OK &&
497 req->http_code != 416) {
498 if (missing_target(req))
e2029eb Silence confusing and false-positive curl error message
Petr Baudis authored
499 ret = -1; /* Be silent, it is probably in a pack. */
500 else
501 ret = error("%s (curl_result = %d, http_code = %ld, sha1 = %s)",
5424bc5 @rctay http*: add helper methods for fetching objects (loose)
rctay authored
502 req->errorstr, req->curl_result,
503 req->http_code, hex);
504 } else if (req->zret != Z_STREAM_END) {
30ae764 Modularize commit-walker
Daniel Barkalow authored
505 walker->corrupt_object_found++;
5424bc5 @rctay http*: add helper methods for fetching objects (loose)
rctay authored
506 ret = error("File %s (%s) corrupt", hex, req->url);
507 } else if (hashcmp(obj_req->sha1, req->real_sha1)) {
bd2afde Give no terminating LF to error() function.
Junio C Hamano authored
508 ret = error("File %s has bad hash", hex);
5424bc5 @rctay http*: add helper methods for fetching objects (loose)
rctay authored
509 } else if (req->rename < 0) {
7b934ec @distorted-mdw http-fetch: Fix message reporting rename of object file.
distorted-mdw authored
510 ret = error("unable to write sha1 filename %s",
0da8b2e @spearce http.c: Don't store destination name in request structures
spearce authored
511 sha1_file_name(req->sha1));
6eb7ed5 [PATCH] Various transport programs
Daniel Barkalow authored
512 }
49a0f24 [PATCH] HTTP partial transfer support for object, pack, and index tra…
Nick Hengeveld authored
513
5424bc5 @rctay http*: add helper methods for fetching objects (loose)
rctay authored
514 release_http_object_request(req);
e388ab7 Make http-fetch request types more clear
Nick Hengeveld authored
515 release_object_request(obj_req);
29508e1 Isolate shared HTTP request functionality
Nick Hengeveld authored
516 return ret;
6eb7ed5 [PATCH] Various transport programs
Daniel Barkalow authored
517 }
518
30ae764 Modularize commit-walker
Daniel Barkalow authored
519 static int fetch(struct walker *walker, unsigned char *sha1)
b366156 [PATCH] Add support for alternates in HTTP
Daniel Barkalow authored
520 {
30ae764 Modularize commit-walker
Daniel Barkalow authored
521 struct walker_data *data = walker->data;
522 struct alt_base *altbase = data->alt;
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
523
30ae764 Modularize commit-walker
Daniel Barkalow authored
524 if (!fetch_object(walker, altbase, sha1))
1d389ab Add support for parallel HTTP transfers
Nick Hengeveld authored
525 return 0;
b366156 [PATCH] Add support for alternates in HTTP
Daniel Barkalow authored
526 while (altbase) {
30ae764 Modularize commit-walker
Daniel Barkalow authored
527 if (!fetch_pack(walker, altbase, sha1))
b366156 [PATCH] Add support for alternates in HTTP
Daniel Barkalow authored
528 return 0;
30ae764 Modularize commit-walker
Daniel Barkalow authored
529 fetch_alternates(walker, data->alt->base);
b366156 [PATCH] Add support for alternates in HTTP
Daniel Barkalow authored
530 altbase = altbase->next;
531 }
bd2afde Give no terminating LF to error() function.
Junio C Hamano authored
532 return error("Unable to find %s under %s", sha1_to_hex(sha1),
30ae764 Modularize commit-walker
Daniel Barkalow authored
533 data->alt->base);
b366156 [PATCH] Add support for alternates in HTTP
Daniel Barkalow authored
534 }
535
c13b263 Make walker.fetch_ref() take a struct ref.
Daniel Barkalow authored
536 static int fetch_ref(struct walker *walker, struct ref *ref)
cd541a6 [PATCH] Generic support for pulling refs
Daniel Barkalow authored
537 {
30ae764 Modularize commit-walker
Daniel Barkalow authored
538 struct walker_data *data = walker->data;
c13b263 Make walker.fetch_ref() take a struct ref.
Daniel Barkalow authored
539 return http_fetch_ref(data->alt->base, ref);
cd541a6 [PATCH] Generic support for pulling refs
Daniel Barkalow authored
540 }
541
30ae764 Modularize commit-walker
Daniel Barkalow authored
542 static void cleanup(struct walker *walker)
543 {
09ae9ac @rctay http-walker: cleanup more thoroughly
rctay authored
544 struct walker_data *data = walker->data;
545 struct alt_base *alt, *alt_next;
546
547 if (data) {
548 alt = data->alt;
549 while (alt) {
550 alt_next = alt->next;
551
552 free(alt->base);
553 free(alt);
554
555 alt = alt_next;
556 }
557 free(data);
558 walker->data = NULL;
559 }
30ae764 Modularize commit-walker
Daniel Barkalow authored
560 }
561
888692b @rctay http: init and cleanup separately from http-walker
rctay authored
562 struct walker *get_http_walker(const char *url)
6eb7ed5 [PATCH] Various transport programs
Daniel Barkalow authored
563 {
9c880b3 http-fetch: remove path_len from struct alt_base, it was computed but…
Gerrit Pape authored
564 char *s;
30ae764 Modularize commit-walker
Daniel Barkalow authored
565 struct walker_data *data = xmalloc(sizeof(struct walker_data));
566 struct walker *walker = xmalloc(sizeof(struct walker));
6eb7ed5 [PATCH] Various transport programs
Daniel Barkalow authored
567
30ae764 Modularize commit-walker
Daniel Barkalow authored
568 data->alt = xmalloc(sizeof(*data->alt));
569 data->alt->base = xmalloc(strlen(url) + 1);
570 strcpy(data->alt->base, url);
571 for (s = data->alt->base + strlen(data->alt->base) - 1; *s == '/'; --s)
9c880b3 http-fetch: remove path_len from struct alt_base, it was computed but…
Gerrit Pape authored
572 *s = 0;
6eb7ed5 [PATCH] Various transport programs
Daniel Barkalow authored
573
30ae764 Modularize commit-walker
Daniel Barkalow authored
574 data->alt->got_indices = 0;
575 data->alt->packs = NULL;
576 data->alt->next = NULL;
577 data->got_alternates = -1;
fc57b6a Make function to refill http queue a callback
Daniel Barkalow authored
578
30ae764 Modularize commit-walker
Daniel Barkalow authored
579 walker->corrupt_object_found = 0;
580 walker->fetch = fetch;
581 walker->fetch_ref = fetch_ref;
582 walker->prefetch = prefetch;
583 walker->cleanup = cleanup;
584 walker->data = data;
6eb7ed5 [PATCH] Various transport programs
Daniel Barkalow authored
585
30ae764 Modularize commit-walker
Daniel Barkalow authored
586 #ifdef USE_CURL_MULTI
587 add_fill_function(walker, (int (*)(void *)) fill_active_slot);
588 #endif
8e29f6a Teach git-http-fetch the --stdin switch
Petr Baudis authored
589
30ae764 Modularize commit-walker
Daniel Barkalow authored
590 return walker;
6eb7ed5 [PATCH] Various transport programs
Daniel Barkalow authored
591 }
Something went wrong with that request. Please try again.