Skip to content

Commit d94e364

Browse files
committed
Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
This brings substantial wins in performance because the FSCache is now per-thread, being merged to the primary thread only at the end, so we do not have to lock (except while merging). Signed-off-by: Johannes Schindelin <[email protected]>
2 parents d9f8dcf + f0ed41c commit d94e364

File tree

10 files changed

+254
-145
lines changed

10 files changed

+254
-145
lines changed

builtin/add.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
461461
die_in_unpopulated_submodule(&the_index, prefix);
462462
die_path_inside_submodule(&the_index, &pathspec);
463463

464-
enable_fscache(1);
464+
enable_fscache(0);
465465
/* We do not really re-read the index but update the up-to-date flags */
466466
preload_index(&the_index, &pathspec, 0);
467467

builtin/checkout.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ static int checkout_paths(const struct checkout_opts *opts,
372372
state.istate = &the_index;
373373

374374
enable_delayed_checkout(&state);
375-
enable_fscache(1);
375+
enable_fscache(active_nr);
376376
for (pos = 0; pos < active_nr; pos++) {
377377
struct cache_entry *ce = active_cache[pos];
378378
if (ce->ce_flags & CE_MATCHED) {
@@ -391,7 +391,7 @@ static int checkout_paths(const struct checkout_opts *opts,
391391
pos = skip_same_name(ce, pos) - 1;
392392
}
393393
}
394-
enable_fscache(0);
394+
disable_fscache();
395395
errs |= finish_delayed_checkout(&state, &nr_checkouts);
396396

397397
if (opts->count_checkout_paths) {

builtin/commit.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1366,7 +1366,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)
13661366
PATHSPEC_PREFER_FULL,
13671367
prefix, argv);
13681368

1369-
enable_fscache(1);
1369+
enable_fscache(0);
13701370
if (status_format != STATUS_FORMAT_PORCELAIN &&
13711371
status_format != STATUS_FORMAT_PORCELAIN_V2)
13721372
progress_flag = REFRESH_PROGRESS;
@@ -1407,7 +1407,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)
14071407
wt_status_print(&s);
14081408
wt_status_collect_free_buffers(&s);
14091409

1410-
enable_fscache(0);
1410+
disable_fscache();
14111411
return 0;
14121412
}
14131413

0 commit comments

Comments
 (0)