diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-08-24 15:32:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-24 15:32:39 -0700 |
| commit | 08ac213965dd861b7182ee7072b613ae29c72ae1 (patch) | |
| tree | f795d84f334a4c92af58fd9c3dc00d1d5af90f52 /diffcore.h | |
| parent | Merge branch 'js/expand-runtime-prefix' (diff) | |
| parent | merge-ort: remove compile-time ability to turn off usage of memory pools (diff) | |
| download | tgif-08ac213965dd861b7182ee7072b613ae29c72ae1.tar.xz | |
Merge branch 'en/ort-perf-batch-15'
Final batch for "merge -sort" optimization.
* en/ort-perf-batch-15:
merge-ort: remove compile-time ability to turn off usage of memory pools
merge-ort: reuse path strings in pool_alloc_filespec
merge-ort: store filepairs and filespecs in our mem_pool
diffcore-rename, merge-ort: add wrapper functions for filepair alloc/dealloc
merge-ort: switch our strmaps over to using memory pools
merge-ort: set up a memory pool
merge-ort: add pool_alloc, pool_calloc, and pool_strndup wrappers
diffcore-rename: use a mem_pool for exact rename detection's hashmap
merge-ort: rename str{map,intmap,set}_func()
Diffstat (limited to 'diffcore.h')
| -rw-r--r-- | diffcore.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/diffcore.h b/diffcore.h index 533b30e21e..badc2261c2 100644 --- a/diffcore.h +++ b/diffcore.h @@ -127,6 +127,8 @@ struct diff_filepair { #define DIFF_PAIR_MODE_CHANGED(p) ((p)->one->mode != (p)->two->mode) void diff_free_filepair(struct diff_filepair *); +void pool_diff_free_filepair(struct mem_pool *pool, + struct diff_filepair *p); int diff_unmodified_pair(struct diff_filepair *); @@ -179,6 +181,7 @@ void partial_clear_dir_rename_count(struct strmap *dir_rename_count); void diffcore_break(struct repository *, int); void diffcore_rename(struct diff_options *); void diffcore_rename_extended(struct diff_options *options, + struct mem_pool *pool, struct strintmap *relevant_sources, struct strintmap *dirs_removed, struct strmap *dir_rename_count, |