Skip to content

Commit 06d3217

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 d3cee07 + 1648964 commit 06d3217

File tree

10 files changed

+256
-145
lines changed

10 files changed

+256
-145
lines changed

builtin/add.c

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

502-
enable_fscache(1);
502+
enable_fscache(0);
503503
/* We do not really re-read the index but update the up-to-date flags */
504504
preload_index(&the_index, &pathspec, 0);
505505

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
@@ -1371,7 +1371,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)
13711371
PATHSPEC_PREFER_FULL,
13721372
prefix, argv);
13731373

1374-
enable_fscache(1);
1374+
enable_fscache(0);
13751375
if (status_format != STATUS_FORMAT_PORCELAIN &&
13761376
status_format != STATUS_FORMAT_PORCELAIN_V2)
13771377
progress_flag = REFRESH_PROGRESS;
@@ -1412,7 +1412,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)
14121412
wt_status_print(&s);
14131413
wt_status_collect_free_buffers(&s);
14141414

1415-
enable_fscache(0);
1415+
disable_fscache();
14161416
return 0;
14171417
}
14181418

0 commit comments

Comments
 (0)