| Message ID | 0fe1a5fabc8cb5f7c2421afaefae030d399d28ed.1619818517.git.matheus.bernardino@usp.br (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Parallel Checkout (part 3) | expand |
On Fri, Apr 30, 2021 at 11:40 PM Matheus Tavares <matheus.bernardino@usp.br> wrote: > > Note: previously, `checkout_all()` would not return on errors, but s/Note: previously/Previously/ > instead call `exit()` with a non-zero code. However, it only did that > after calling `checkout_entry()` for all index entries, thus not > stopping on the first error, but attempting to write the maximum number > of entries possible. In order to maintain this behavior we now propagate > `checkout_all()`s error status to `cmd_checkout_index()`, so that it can > call `run_parallel_checkout()` and attempt to write the queued entries > before exiting with the error code. > > Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br> > @@ -142,11 +143,7 @@ static void checkout_all(const char *prefix, int prefix_length) > } > if (last_ce && to_tempfile) > write_tempfile_record(last_ce->name, prefix); > - if (errs) > - /* we have already done our error reporting. > - * exit with the same code as die(). > - */ > - exit(128); So when there were errors in checkout_all(), we used to exit() with error code 128 (same as die())... > @@ -275,12 +277,16 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix) > strbuf_release(&buf); > } > > + if (all) > + err |= checkout_all(prefix, prefix_length); > + > + if (pc_workers > 1) > + err |= run_parallel_checkout(&state, pc_workers, pc_threshold, > + NULL, NULL); > + > if (err) > return 1; ...but now it looks like we will exit with error code 1. I see that you already answered this comment in the previous round of review, but you didn't add the explanations to the commit message.
On Sat, May 1, 2021 at 2:08 PM Christian Couder <christian.couder@gmail.com> wrote: > > On Fri, Apr 30, 2021 at 11:40 PM Matheus Tavares > <matheus.bernardino@usp.br> wrote: > > > > Note: previously, `checkout_all()` would not return on errors, but > > s/Note: previously/Previously/ > > > instead call `exit()` with a non-zero code. However, it only did that > > after calling `checkout_entry()` for all index entries, thus not > > stopping on the first error, but attempting to write the maximum number > > of entries possible. In order to maintain this behavior we now propagate > > `checkout_all()`s error status to `cmd_checkout_index()`, so that it can > > call `run_parallel_checkout()` and attempt to write the queued entries > > before exiting with the error code. > > > > Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br> > > > @@ -142,11 +143,7 @@ static void checkout_all(const char *prefix, int prefix_length) > > } > > if (last_ce && to_tempfile) > > write_tempfile_record(last_ce->name, prefix); > > - if (errs) > > - /* we have already done our error reporting. > > - * exit with the same code as die(). > > - */ > > - exit(128); > > So when there were errors in checkout_all(), we used to exit() with > error code 128 (same as die())... > > > @@ -275,12 +277,16 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix) > > strbuf_release(&buf); > > } > > > > + if (all) > > + err |= checkout_all(prefix, prefix_length); > > + > > + if (pc_workers > 1) > > + err |= run_parallel_checkout(&state, pc_workers, pc_threshold, > > + NULL, NULL); > > + > > if (err) > > return 1; > > ...but now it looks like we will exit with error code 1. I see that > you already answered this comment in the previous round of review, but > you didn't add the explanations to the commit message. Oops, good catch! I'll add the explanation for v3. Thanks.
diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c index c0bf4ac1b2..e8a82ea9ed 100644 --- a/builtin/checkout-index.c +++ b/builtin/checkout-index.c @@ -12,6 +12,7 @@ #include "cache-tree.h" #include "parse-options.h" #include "entry.h" +#include "parallel-checkout.h" #define CHECKOUT_ALL 4 static int nul_term_line; @@ -115,7 +116,7 @@ static int checkout_file(const char *name, const char *prefix) return -1; } -static void checkout_all(const char *prefix, int prefix_length) +static int checkout_all(const char *prefix, int prefix_length) { int i, errs = 0; struct cache_entry *last_ce = NULL; @@ -142,11 +143,7 @@ static void checkout_all(const char *prefix, int prefix_length) } if (last_ce && to_tempfile) write_tempfile_record(last_ce->name, prefix); - if (errs) - /* we have already done our error reporting. - * exit with the same code as die(). - */ - exit(128); + return !!errs; } static const char * const builtin_checkout_index_usage[] = { @@ -182,6 +179,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix) int force = 0, quiet = 0, not_new = 0; int index_opt = 0; int err = 0; + int pc_workers, pc_threshold; struct option builtin_checkout_index_options[] = { OPT_BOOL('a', "all", &all, N_("check out all files in the index")), @@ -236,6 +234,10 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix) hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR); } + get_parallel_checkout_configs(&pc_workers, &pc_threshold); + if (pc_workers > 1) + init_parallel_checkout(); + /* Check out named files first */ for (i = 0; i < argc; i++) { const char *arg = argv[i]; @@ -275,12 +277,16 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix) strbuf_release(&buf); } + if (all) + err |= checkout_all(prefix, prefix_length); + + if (pc_workers > 1) + err |= run_parallel_checkout(&state, pc_workers, pc_threshold, + NULL, NULL); + if (err) return 1; - if (all) - checkout_all(prefix, prefix_length); - if (is_lock_file_locked(&lock_file) && write_locked_index(&the_index, &lock_file, COMMIT_LOCK)) die("Unable to write new index file");
Note: previously, `checkout_all()` would not return on errors, but instead call `exit()` with a non-zero code. However, it only did that after calling `checkout_entry()` for all index entries, thus not stopping on the first error, but attempting to write the maximum number of entries possible. In order to maintain this behavior we now propagate `checkout_all()`s error status to `cmd_checkout_index()`, so that it can call `run_parallel_checkout()` and attempt to write the queued entries before exiting with the error code. Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br> --- builtin/checkout-index.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-)