Merge branch 'ds/ahead-behind'
[git.git] / parallel-checkout.c
blob2455aa356db920f00b9e025bcc5134468ce18ef0
1 #include "cache.h"
2 #include "alloc.h"
3 #include "config.h"
4 #include "entry.h"
5 #include "hex.h"
6 #include "parallel-checkout.h"
7 #include "pkt-line.h"
8 #include "progress.h"
9 #include "run-command.h"
10 #include "sigchain.h"
11 #include "streaming.h"
12 #include "thread-utils.h"
13 #include "trace2.h"
15 struct pc_worker {
16 struct child_process cp;
17 size_t next_item_to_complete, nr_items_to_complete;
20 struct parallel_checkout {
21 enum pc_status status;
22 struct parallel_checkout_item *items; /* The parallel checkout queue. */
23 size_t nr, alloc;
24 struct progress *progress;
25 unsigned int *progress_cnt;
28 static struct parallel_checkout parallel_checkout;
30 enum pc_status parallel_checkout_status(void)
32 return parallel_checkout.status;
35 static const int DEFAULT_THRESHOLD_FOR_PARALLELISM = 100;
36 static const int DEFAULT_NUM_WORKERS = 1;
38 void get_parallel_checkout_configs(int *num_workers, int *threshold)
40 char *env_workers = getenv("GIT_TEST_CHECKOUT_WORKERS");
42 if (env_workers && *env_workers) {
43 if (strtol_i(env_workers, 10, num_workers)) {
44 die(_("invalid value for '%s': '%s'"),
45 "GIT_TEST_CHECKOUT_WORKERS", env_workers);
47 if (*num_workers < 1)
48 *num_workers = online_cpus();
50 *threshold = 0;
51 return;
54 if (git_config_get_int("checkout.workers", num_workers))
55 *num_workers = DEFAULT_NUM_WORKERS;
56 else if (*num_workers < 1)
57 *num_workers = online_cpus();
59 if (git_config_get_int("checkout.thresholdForParallelism", threshold))
60 *threshold = DEFAULT_THRESHOLD_FOR_PARALLELISM;
63 void init_parallel_checkout(void)
65 if (parallel_checkout.status != PC_UNINITIALIZED)
66 BUG("parallel checkout already initialized");
68 parallel_checkout.status = PC_ACCEPTING_ENTRIES;
71 static void finish_parallel_checkout(void)
73 if (parallel_checkout.status == PC_UNINITIALIZED)
74 BUG("cannot finish parallel checkout: not initialized yet");
76 free(parallel_checkout.items);
77 memset(&parallel_checkout, 0, sizeof(parallel_checkout));
80 static int is_eligible_for_parallel_checkout(const struct cache_entry *ce,
81 const struct conv_attrs *ca)
83 enum conv_attrs_classification c;
84 size_t packed_item_size;
87 * Symlinks cannot be checked out in parallel as, in case of path
88 * collision, they could racily replace leading directories of other
89 * entries being checked out. Submodules are checked out in child
90 * processes, which have their own parallel checkout queues.
92 if (!S_ISREG(ce->ce_mode))
93 return 0;
95 packed_item_size = sizeof(struct pc_item_fixed_portion) + ce->ce_namelen +
96 (ca->working_tree_encoding ? strlen(ca->working_tree_encoding) : 0);
99 * The amount of data we send to the workers per checkout item is
100 * typically small (75~300B). So unless we find an insanely huge path
101 * of 64KB, we should never reach the 65KB limit of one pkt-line. If
102 * that does happen, we let the sequential code handle the item.
104 if (packed_item_size > LARGE_PACKET_DATA_MAX)
105 return 0;
107 c = classify_conv_attrs(ca);
108 switch (c) {
109 case CA_CLASS_INCORE:
110 return 1;
112 case CA_CLASS_INCORE_FILTER:
114 * It would be safe to allow concurrent instances of
115 * single-file smudge filters, like rot13, but we should not
116 * assume that all filters are parallel-process safe. So we
117 * don't allow this.
119 return 0;
121 case CA_CLASS_INCORE_PROCESS:
123 * The parallel queue and the delayed queue are not compatible,
124 * so they must be kept completely separated. And we can't tell
125 * if a long-running process will delay its response without
126 * actually asking it to perform the filtering. Therefore, this
127 * type of filter is not allowed in parallel checkout.
129 * Furthermore, there should only be one instance of the
130 * long-running process filter as we don't know how it is
131 * managing its own concurrency. So, spreading the entries that
132 * requisite such a filter among the parallel workers would
133 * require a lot more inter-process communication. We would
134 * probably have to designate a single process to interact with
135 * the filter and send all the necessary data to it, for each
136 * entry.
138 return 0;
140 case CA_CLASS_STREAMABLE:
141 return 1;
143 default:
144 BUG("unsupported conv_attrs classification '%d'", c);
148 int enqueue_checkout(struct cache_entry *ce, struct conv_attrs *ca,
149 int *checkout_counter)
151 struct parallel_checkout_item *pc_item;
153 if (parallel_checkout.status != PC_ACCEPTING_ENTRIES ||
154 !is_eligible_for_parallel_checkout(ce, ca))
155 return -1;
157 ALLOC_GROW(parallel_checkout.items, parallel_checkout.nr + 1,
158 parallel_checkout.alloc);
160 pc_item = &parallel_checkout.items[parallel_checkout.nr];
161 pc_item->ce = ce;
162 memcpy(&pc_item->ca, ca, sizeof(pc_item->ca));
163 pc_item->status = PC_ITEM_PENDING;
164 pc_item->id = parallel_checkout.nr;
165 pc_item->checkout_counter = checkout_counter;
166 parallel_checkout.nr++;
168 return 0;
171 size_t pc_queue_size(void)
173 return parallel_checkout.nr;
176 static void advance_progress_meter(void)
178 if (parallel_checkout.progress) {
179 (*parallel_checkout.progress_cnt)++;
180 display_progress(parallel_checkout.progress,
181 *parallel_checkout.progress_cnt);
185 static int handle_results(struct checkout *state)
187 int ret = 0;
188 size_t i;
189 int have_pending = 0;
192 * We first update the successfully written entries with the collected
193 * stat() data, so that they can be found by mark_colliding_entries(),
194 * in the next loop, when necessary.
196 for (i = 0; i < parallel_checkout.nr; i++) {
197 struct parallel_checkout_item *pc_item = &parallel_checkout.items[i];
198 if (pc_item->status == PC_ITEM_WRITTEN)
199 update_ce_after_write(state, pc_item->ce, &pc_item->st);
202 for (i = 0; i < parallel_checkout.nr; i++) {
203 struct parallel_checkout_item *pc_item = &parallel_checkout.items[i];
205 switch(pc_item->status) {
206 case PC_ITEM_WRITTEN:
207 if (pc_item->checkout_counter)
208 (*pc_item->checkout_counter)++;
209 break;
210 case PC_ITEM_COLLIDED:
212 * The entry could not be checked out due to a path
213 * collision with another entry. Since there can only
214 * be one entry of each colliding group on the disk, we
215 * could skip trying to check out this one and move on.
216 * However, this would leave the unwritten entries with
217 * null stat() fields on the index, which could
218 * potentially slow down subsequent operations that
219 * require refreshing it: git would not be able to
220 * trust st_size and would have to go to the filesystem
221 * to see if the contents match (see ie_modified()).
223 * Instead, let's pay the overhead only once, now, and
224 * call checkout_entry_ca() again for this file, to
225 * have its stat() data stored in the index. This also
226 * has the benefit of adding this entry and its
227 * colliding pair to the collision report message.
228 * Additionally, this overwriting behavior is consistent
229 * with what the sequential checkout does, so it doesn't
230 * add any extra overhead.
232 ret |= checkout_entry_ca(pc_item->ce, &pc_item->ca,
233 state, NULL,
234 pc_item->checkout_counter);
235 advance_progress_meter();
236 break;
237 case PC_ITEM_PENDING:
238 have_pending = 1;
239 /* fall through */
240 case PC_ITEM_FAILED:
241 ret = -1;
242 break;
243 default:
244 BUG("unknown checkout item status in parallel checkout");
248 if (have_pending)
249 error("parallel checkout finished with pending entries");
251 return ret;
254 static int reset_fd(int fd, const char *path)
256 if (lseek(fd, 0, SEEK_SET) != 0)
257 return error_errno("failed to rewind descriptor of '%s'", path);
258 if (ftruncate(fd, 0))
259 return error_errno("failed to truncate file '%s'", path);
260 return 0;
263 static int write_pc_item_to_fd(struct parallel_checkout_item *pc_item, int fd,
264 const char *path)
266 int ret;
267 struct stream_filter *filter;
268 struct strbuf buf = STRBUF_INIT;
269 char *blob;
270 size_t size;
271 ssize_t wrote;
273 /* Sanity check */
274 assert(is_eligible_for_parallel_checkout(pc_item->ce, &pc_item->ca));
276 filter = get_stream_filter_ca(&pc_item->ca, &pc_item->ce->oid);
277 if (filter) {
278 if (stream_blob_to_fd(fd, &pc_item->ce->oid, filter, 1)) {
279 /* On error, reset fd to try writing without streaming */
280 if (reset_fd(fd, path))
281 return -1;
282 } else {
283 return 0;
287 blob = read_blob_entry(pc_item->ce, &size);
288 if (!blob)
289 return error("cannot read object %s '%s'",
290 oid_to_hex(&pc_item->ce->oid), pc_item->ce->name);
293 * checkout metadata is used to give context for external process
294 * filters. Files requiring such filters are not eligible for parallel
295 * checkout, so pass NULL. Note: if that changes, the metadata must also
296 * be passed from the main process to the workers.
298 ret = convert_to_working_tree_ca(&pc_item->ca, pc_item->ce->name,
299 blob, size, &buf, NULL);
301 if (ret) {
302 size_t newsize;
303 free(blob);
304 blob = strbuf_detach(&buf, &newsize);
305 size = newsize;
308 wrote = write_in_full(fd, blob, size);
309 free(blob);
310 if (wrote < 0)
311 return error("unable to write file '%s'", path);
313 return 0;
316 static int close_and_clear(int *fd)
318 int ret = 0;
320 if (*fd >= 0) {
321 ret = close(*fd);
322 *fd = -1;
325 return ret;
328 void write_pc_item(struct parallel_checkout_item *pc_item,
329 struct checkout *state)
331 unsigned int mode = (pc_item->ce->ce_mode & 0100) ? 0777 : 0666;
332 int fd = -1, fstat_done = 0;
333 struct strbuf path = STRBUF_INIT;
334 const char *dir_sep;
336 strbuf_add(&path, state->base_dir, state->base_dir_len);
337 strbuf_add(&path, pc_item->ce->name, pc_item->ce->ce_namelen);
339 dir_sep = find_last_dir_sep(path.buf);
342 * The leading dirs should have been already created by now. But, in
343 * case of path collisions, one of the dirs could have been replaced by
344 * a symlink (checked out after we enqueued this entry for parallel
345 * checkout). Thus, we must check the leading dirs again.
347 if (dir_sep && !has_dirs_only_path(path.buf, dir_sep - path.buf,
348 state->base_dir_len)) {
349 pc_item->status = PC_ITEM_COLLIDED;
350 trace2_data_string("pcheckout", NULL, "collision/dirname", path.buf);
351 goto out;
354 fd = open(path.buf, O_WRONLY | O_CREAT | O_EXCL, mode);
356 if (fd < 0) {
357 if (errno == EEXIST || errno == EISDIR) {
359 * Errors which probably represent a path collision.
360 * Suppress the error message and mark the item to be
361 * retried later, sequentially. ENOTDIR and ENOENT are
362 * also interesting, but the above has_dirs_only_path()
363 * call should have already caught these cases.
365 pc_item->status = PC_ITEM_COLLIDED;
366 trace2_data_string("pcheckout", NULL,
367 "collision/basename", path.buf);
368 } else {
369 error_errno("failed to open file '%s'", path.buf);
370 pc_item->status = PC_ITEM_FAILED;
372 goto out;
375 if (write_pc_item_to_fd(pc_item, fd, path.buf)) {
376 /* Error was already reported. */
377 pc_item->status = PC_ITEM_FAILED;
378 close_and_clear(&fd);
379 unlink(path.buf);
380 goto out;
383 fstat_done = fstat_checkout_output(fd, state, &pc_item->st);
385 if (close_and_clear(&fd)) {
386 error_errno("unable to close file '%s'", path.buf);
387 pc_item->status = PC_ITEM_FAILED;
388 goto out;
391 if (state->refresh_cache && !fstat_done && lstat(path.buf, &pc_item->st) < 0) {
392 error_errno("unable to stat just-written file '%s'", path.buf);
393 pc_item->status = PC_ITEM_FAILED;
394 goto out;
397 pc_item->status = PC_ITEM_WRITTEN;
399 out:
400 strbuf_release(&path);
403 static void send_one_item(int fd, struct parallel_checkout_item *pc_item)
405 size_t len_data;
406 char *data, *variant;
407 struct pc_item_fixed_portion *fixed_portion;
408 const char *working_tree_encoding = pc_item->ca.working_tree_encoding;
409 size_t name_len = pc_item->ce->ce_namelen;
410 size_t working_tree_encoding_len = working_tree_encoding ?
411 strlen(working_tree_encoding) : 0;
414 * Any changes in the calculation of the message size must also be made
415 * in is_eligible_for_parallel_checkout().
417 len_data = sizeof(struct pc_item_fixed_portion) + name_len +
418 working_tree_encoding_len;
420 data = xmalloc(len_data);
422 fixed_portion = (struct pc_item_fixed_portion *)data;
423 fixed_portion->id = pc_item->id;
424 fixed_portion->ce_mode = pc_item->ce->ce_mode;
425 fixed_portion->crlf_action = pc_item->ca.crlf_action;
426 fixed_portion->ident = pc_item->ca.ident;
427 fixed_portion->name_len = name_len;
428 fixed_portion->working_tree_encoding_len = working_tree_encoding_len;
430 * We pad the unused bytes in the hash array because, otherwise,
431 * Valgrind would complain about passing uninitialized bytes to a
432 * write() syscall. The warning doesn't represent any real risk here,
433 * but it could hinder the detection of actual errors.
435 oidcpy_with_padding(&fixed_portion->oid, &pc_item->ce->oid);
437 variant = data + sizeof(*fixed_portion);
438 if (working_tree_encoding_len) {
439 memcpy(variant, working_tree_encoding, working_tree_encoding_len);
440 variant += working_tree_encoding_len;
442 memcpy(variant, pc_item->ce->name, name_len);
444 packet_write(fd, data, len_data);
446 free(data);
449 static void send_batch(int fd, size_t start, size_t nr)
451 size_t i;
452 sigchain_push(SIGPIPE, SIG_IGN);
453 for (i = 0; i < nr; i++)
454 send_one_item(fd, &parallel_checkout.items[start + i]);
455 packet_flush(fd);
456 sigchain_pop(SIGPIPE);
459 static struct pc_worker *setup_workers(struct checkout *state, int num_workers)
461 struct pc_worker *workers;
462 int i, workers_with_one_extra_item;
463 size_t base_batch_size, batch_beginning = 0;
465 ALLOC_ARRAY(workers, num_workers);
467 for (i = 0; i < num_workers; i++) {
468 struct child_process *cp = &workers[i].cp;
470 child_process_init(cp);
471 cp->git_cmd = 1;
472 cp->in = -1;
473 cp->out = -1;
474 cp->clean_on_exit = 1;
475 strvec_push(&cp->args, "checkout--worker");
476 if (state->base_dir_len)
477 strvec_pushf(&cp->args, "--prefix=%s", state->base_dir);
478 if (start_command(cp))
479 die("failed to spawn checkout worker");
482 base_batch_size = parallel_checkout.nr / num_workers;
483 workers_with_one_extra_item = parallel_checkout.nr % num_workers;
485 for (i = 0; i < num_workers; i++) {
486 struct pc_worker *worker = &workers[i];
487 size_t batch_size = base_batch_size;
489 /* distribute the extra work evenly */
490 if (i < workers_with_one_extra_item)
491 batch_size++;
493 send_batch(worker->cp.in, batch_beginning, batch_size);
494 worker->next_item_to_complete = batch_beginning;
495 worker->nr_items_to_complete = batch_size;
497 batch_beginning += batch_size;
500 return workers;
503 static void finish_workers(struct pc_worker *workers, int num_workers)
505 int i;
508 * Close pipes before calling finish_command() to let the workers
509 * exit asynchronously and avoid spending extra time on wait().
511 for (i = 0; i < num_workers; i++) {
512 struct child_process *cp = &workers[i].cp;
513 if (cp->in >= 0)
514 close(cp->in);
515 if (cp->out >= 0)
516 close(cp->out);
519 for (i = 0; i < num_workers; i++) {
520 int rc = finish_command(&workers[i].cp);
521 if (rc > 128) {
523 * For a normal non-zero exit, the worker should have
524 * already printed something useful to stderr. But a
525 * death by signal should be mentioned to the user.
527 error("checkout worker %d died of signal %d", i, rc - 128);
531 free(workers);
534 static inline void assert_pc_item_result_size(int got, int exp)
536 if (got != exp)
537 BUG("wrong result size from checkout worker (got %dB, exp %dB)",
538 got, exp);
541 static void parse_and_save_result(const char *buffer, int len,
542 struct pc_worker *worker)
544 struct pc_item_result *res;
545 struct parallel_checkout_item *pc_item;
546 struct stat *st = NULL;
548 if (len < PC_ITEM_RESULT_BASE_SIZE)
549 BUG("too short result from checkout worker (got %dB, exp >=%dB)",
550 len, (int)PC_ITEM_RESULT_BASE_SIZE);
552 res = (struct pc_item_result *)buffer;
555 * Worker should send either the full result struct on success, or
556 * just the base (i.e. no stat data), otherwise.
558 if (res->status == PC_ITEM_WRITTEN) {
559 assert_pc_item_result_size(len, (int)sizeof(struct pc_item_result));
560 st = &res->st;
561 } else {
562 assert_pc_item_result_size(len, (int)PC_ITEM_RESULT_BASE_SIZE);
565 if (!worker->nr_items_to_complete)
566 BUG("received result from supposedly finished checkout worker");
567 if (res->id != worker->next_item_to_complete)
568 BUG("unexpected item id from checkout worker (got %"PRIuMAX", exp %"PRIuMAX")",
569 (uintmax_t)res->id, (uintmax_t)worker->next_item_to_complete);
571 worker->next_item_to_complete++;
572 worker->nr_items_to_complete--;
574 pc_item = &parallel_checkout.items[res->id];
575 pc_item->status = res->status;
576 if (st)
577 pc_item->st = *st;
579 if (res->status != PC_ITEM_COLLIDED)
580 advance_progress_meter();
583 static void gather_results_from_workers(struct pc_worker *workers,
584 int num_workers)
586 int i, active_workers = num_workers;
587 struct pollfd *pfds;
589 CALLOC_ARRAY(pfds, num_workers);
590 for (i = 0; i < num_workers; i++) {
591 pfds[i].fd = workers[i].cp.out;
592 pfds[i].events = POLLIN;
595 while (active_workers) {
596 int nr = poll(pfds, num_workers, -1);
598 if (nr < 0) {
599 if (errno == EINTR)
600 continue;
601 die_errno("failed to poll checkout workers");
604 for (i = 0; i < num_workers && nr > 0; i++) {
605 struct pc_worker *worker = &workers[i];
606 struct pollfd *pfd = &pfds[i];
608 if (!pfd->revents)
609 continue;
611 if (pfd->revents & POLLIN) {
612 int len = packet_read(pfd->fd, packet_buffer,
613 sizeof(packet_buffer), 0);
615 if (len < 0) {
616 BUG("packet_read() returned negative value");
617 } else if (!len) {
618 pfd->fd = -1;
619 active_workers--;
620 } else {
621 parse_and_save_result(packet_buffer,
622 len, worker);
624 } else if (pfd->revents & POLLHUP) {
625 pfd->fd = -1;
626 active_workers--;
627 } else if (pfd->revents & (POLLNVAL | POLLERR)) {
628 die("error polling from checkout worker");
631 nr--;
635 free(pfds);
638 static void write_items_sequentially(struct checkout *state)
640 size_t i;
642 for (i = 0; i < parallel_checkout.nr; i++) {
643 struct parallel_checkout_item *pc_item = &parallel_checkout.items[i];
644 write_pc_item(pc_item, state);
645 if (pc_item->status != PC_ITEM_COLLIDED)
646 advance_progress_meter();
650 int run_parallel_checkout(struct checkout *state, int num_workers, int threshold,
651 struct progress *progress, unsigned int *progress_cnt)
653 int ret;
655 if (parallel_checkout.status != PC_ACCEPTING_ENTRIES)
656 BUG("cannot run parallel checkout: uninitialized or already running");
658 parallel_checkout.status = PC_RUNNING;
659 parallel_checkout.progress = progress;
660 parallel_checkout.progress_cnt = progress_cnt;
662 if (parallel_checkout.nr < num_workers)
663 num_workers = parallel_checkout.nr;
665 if (num_workers <= 1 || parallel_checkout.nr < threshold) {
666 write_items_sequentially(state);
667 } else {
668 struct pc_worker *workers = setup_workers(state, num_workers);
669 gather_results_from_workers(workers, num_workers);
670 finish_workers(workers, num_workers);
673 ret = handle_results(state);
675 finish_parallel_checkout();
676 return ret;