config: make `delta_base_cache_limit` a non-global variable

The `delta_base_cache_limit` variable is a global config variable used
by multiple subsystems. Let's make this non-global, by adding this
variable independently to the subsystems where it is used.

First, add the setting to the `repo_settings` struct, this provides
access to the config in places where the repository is available. Use
this in `packfile.c`.

In `index-pack.c` we add it to the `pack_idx_option` struct and its
constructor. While the repository struct is available here, it may not
be set  because `git index-pack` can be used without a repository.

In `gc.c` add it to the `gc_config` struct and also the constructor
function. The gc functions currently do not have direct access to a
repository struct.

These changes are made to remove the usage of `delta_base_cache_limit`
as a global variable in `packfile.c`. This brings us one step closer to
removing the `USE_THE_REPOSITORY_VARIABLE` definition in `packfile.c`
which we complete in the next patch.

Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/gc.c b/builtin/gc.c
index d52735354c9f87ba4e8acb593dd11aa0482223e1..efb6162fb0175503082325f85497a945003c69e3 100644 (file)
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -138,6 +138,11 @@ struct gc_config {
        char *repack_filter_to;
        unsigned long big_pack_threshold;
        unsigned long max_delta_cache_size;
+       /*
+        * Remove this member from gc_config once repo_settings is passed
+        * through the callchain.
+        */
+       size_t delta_base_cache_limit;
 };
 
 #define GC_CONFIG_INIT { \
@@ -153,6 +158,7 @@ struct gc_config {
        .prune_expire = xstrdup("2.weeks.ago"), \
        .prune_worktrees_expire = xstrdup("3.months.ago"), \
        .max_delta_cache_size = DEFAULT_DELTA_CACHE_SIZE, \
+       .delta_base_cache_limit = DEFAULT_DELTA_BASE_CACHE_LIMIT, \
 }
 
 static void gc_config_release(struct gc_config *cfg)
@@ -168,6 +174,7 @@ static void gc_config(struct gc_config *cfg)
 {
        const char *value;
        char *owned = NULL;
+       unsigned long ulongval;
 
        if (!git_config_get_value("gc.packrefs", &value)) {
                if (value && !strcmp(value, "notbare"))
@@ -206,6 +213,9 @@ static void gc_config(struct gc_config *cfg)
        git_config_get_ulong("gc.bigpackthreshold", &cfg->big_pack_threshold);
        git_config_get_ulong("pack.deltacachesize", &cfg->max_delta_cache_size);
 
+       if (!git_config_get_ulong("core.deltabasecachelimit", &ulongval))
+               cfg->delta_base_cache_limit = ulongval;
+
        if (!git_config_get_string("gc.repackfilter", &owned)) {
                free(cfg->repack_filter);
                cfg->repack_filter = owned;
@@ -416,7 +426,7 @@ static uint64_t estimate_repack_memory(struct gc_config *cfg,
         * read_sha1_file() (either at delta calculation phase, or
         * writing phase) also fills up the delta base cache
         */
-       heap += delta_base_cache_limit;
+       heap += cfg->delta_base_cache_limit;
        /* and of course pack-objects has its own delta cache */
        heap += cfg->max_delta_cache_size;
 

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index eaefb41761e20ee353e392a9fd4dbf678e42a626..23bfa454031af76ad819067a0e7f9af387515218 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -1238,7 +1238,7 @@ static void parse_pack_objects(unsigned char *hash)
  *   recursively checking if the resulting object is used as a base
  *   for some more deltas.
  */
-static void resolve_deltas(void)
+static void resolve_deltas(struct pack_idx_option *opts)
 {
        int i;
 
@@ -1254,7 +1254,7 @@ static void resolve_deltas(void)
                                          nr_ref_deltas + nr_ofs_deltas);
 
        nr_dispatched = 0;
-       base_cache_limit = delta_base_cache_limit * nr_threads;
+       base_cache_limit = opts->delta_base_cache_limit * nr_threads;
        if (nr_threads > 1 || getenv("GIT_FORCE_THREADS")) {
                init_thread();
                work_lock();
@@ -1604,6 +1604,10 @@ static int git_index_pack_config(const char *k, const char *v,
                else
                        opts->flags &= ~WRITE_REV;
        }
+       if (!strcmp(k, "core.deltabasecachelimit")) {
+               opts->delta_base_cache_limit = git_config_ulong(k, v, ctx->kvi);
+               return 0;
+       }
        return git_default_config(k, v, ctx, cb);
 }
 
@@ -1930,7 +1934,7 @@ int cmd_index_pack(int argc,
        parse_pack_objects(pack_hash);
        if (report_end_of_input)
                write_in_full(2, "\0", 1);
-       resolve_deltas();
+       resolve_deltas(&opts);
        conclude_pack(fix_thin_pack, curr_pack, pack_hash);
        free(ofs_deltas);
        free(ref_deltas);

diff --git a/config.c b/config.c
index a11bb85da303a7267e86a7a0b420fe22881e4d4f..728ef98e427d6a8b7ae6ec71cfca444911fbdae5 100644 (file)
--- a/config.c
+++ b/config.c
@@ -1515,11 +1515,6 @@ static int git_default_core_config(const char *var, const char *value,
                return 0;
        }
 
-       if (!strcmp(var, "core.deltabasecachelimit")) {
-               delta_base_cache_limit = git_config_ulong(var, value, ctx->kvi);
-               return 0;
-       }
-
        if (!strcmp(var, "core.autocrlf")) {
                if (value && !strcasecmp(value, "input")) {
                        auto_crlf = AUTO_CRLF_INPUT;

diff --git a/environment.c b/environment.c
index a2ce998081864da3dae678a2b8c44df61295626c..8e5022c282ca032411942d29b0a83e6cc010ea6a 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -51,7 +51,6 @@ enum fsync_method fsync_method = FSYNC_METHOD_DEFAULT;
 enum fsync_component fsync_components = FSYNC_COMPONENTS_DEFAULT;
 size_t packed_git_window_size = DEFAULT_PACKED_GIT_WINDOW_SIZE;
 size_t packed_git_limit = DEFAULT_PACKED_GIT_LIMIT;
-size_t delta_base_cache_limit = 96 * 1024 * 1024;
 unsigned long big_file_threshold = 512 * 1024 * 1024;
 char *editor_program;
 char *askpass_program;

diff --git a/environment.h b/environment.h
index 923e12661e19e45af18801af91bc4f8032a7ec14..2f43340f0b553a3b74b692c4c8a3836cf477506a 100644 (file)
--- a/environment.h
+++ b/environment.h
@@ -165,7 +165,6 @@ extern int zlib_compression_level;
 extern int pack_compression_level;
 extern size_t packed_git_window_size;
 extern size_t packed_git_limit;
-extern size_t delta_base_cache_limit;
 extern unsigned long big_file_threshold;
 extern unsigned long pack_size_limit_cfg;
 extern int max_allowed_tree_depth;

diff --git a/pack-objects.h b/pack-objects.h
index b9898a4e64b8b4d53b21ea776c16f79d9794efef..3f6f5042030041205a419201b672c59acfc9c203 100644 (file)
--- a/pack-objects.h
+++ b/pack-objects.h
@@ -7,7 +7,8 @@
 
 struct repository;
 
-#define DEFAULT_DELTA_CACHE_SIZE (256 * 1024 * 1024)
+#define DEFAULT_DELTA_CACHE_SIZE       (256 * 1024 * 1024)
+#define DEFAULT_DELTA_BASE_CACHE_LIMIT (96 * 1024 * 1024)
 
 #define OE_DFS_STATE_BITS      2
 #define OE_DEPTH_BITS          12

diff --git a/pack-write.c b/pack-write.c
index 8c7dfddc5aa71a76bce2724d9b6b9806e58e7124..98a8c0e7853d7b46b5ce9a9672e0249ff051b5f9 100644 (file)
--- a/pack-write.c
+++ b/pack-write.c
@@ -21,6 +21,7 @@ void reset_pack_idx_option(struct pack_idx_option *opts)
        memset(opts, 0, sizeof(*opts));
        opts->version = 2;
        opts->off32_limit = 0x7fffffff;
+       opts->delta_base_cache_limit = DEFAULT_DELTA_BASE_CACHE_LIMIT;
 }
 
 static int sha1_compare(const void *_a, const void *_b)

diff --git a/pack.h b/pack.h
index 02bbdfb19cc030b5b01ad39693876916a33df183..a8da0406299bf267205256aaa8efb215f2ff73be 100644 (file)
--- a/pack.h
+++ b/pack.h
@@ -58,6 +58,8 @@ struct pack_idx_option {
         */
        int anomaly_alloc, anomaly_nr;
        uint32_t *anomaly;
+
+       size_t delta_base_cache_limit;
 };
 
 void reset_pack_idx_option(struct pack_idx_option *);

diff --git a/packfile.c b/packfile.c
index 5e8019b1fe4c72abd77e3592ece48ff6c8b53fe3..64248ca664a0309cfc86bbfe727aa20740afea8a 100644 (file)
--- a/packfile.c
+++ b/packfile.c
@@ -1496,7 +1496,9 @@ void clear_delta_base_cache(void)
 }
 
 static void add_delta_base_cache(struct packed_git *p, off_t base_offset,
-       void *base, unsigned long base_size, enum object_type type)
+                                void *base, unsigned long base_size,
+                                unsigned long delta_base_cache_limit,
+                                enum object_type type)
 {
        struct delta_base_cache_entry *ent;
        struct list_head *lru, *tmp;
@@ -1698,6 +1700,8 @@ void *unpack_entry(struct repository *r, struct packed_git *p, off_t obj_offset,
        int delta_stack_nr = 0, delta_stack_alloc = UNPACK_ENTRY_STACK_PREALLOC;
        int base_from_cache = 0;
 
+       prepare_repo_settings(p->repo);
+
        write_pack_access_log(p, obj_offset);
 
        /* PHASE 1: drill down to the innermost base object */
@@ -1878,7 +1882,9 @@ void *unpack_entry(struct repository *r, struct packed_git *p, off_t obj_offset,
                 * before we are done using it.
                 */
                if (!external_base)
-                       add_delta_base_cache(p, base_obj_offset, base, base_size, type);
+                       add_delta_base_cache(p, base_obj_offset, base, base_size,
+                                            p->repo->settings.delta_base_cache_limit,
+                                            type);
 
                free(delta_data);
                free(external_base);

diff --git a/repo-settings.c b/repo-settings.c
index 4699b4b3650fc3571b0240e15b539ba19d179e20..acc27eb8fe7ce7dd9dbf3ff23c1f485f513c4c53 100644 (file)
--- a/repo-settings.c
+++ b/repo-settings.c
@@ -3,6 +3,7 @@
 #include "repo-settings.h"
 #include "repository.h"
 #include "midx.h"
+#include "pack-objects.h"
 
 static void repo_cfg_bool(struct repository *r, const char *key, int *dest,
                          int def)
@@ -26,6 +27,7 @@ void prepare_repo_settings(struct repository *r)
        const char *strval;
        int manyfiles;
        int read_changed_paths;
+       unsigned long ulongval;
 
        if (!r->gitdir)
                BUG("Cannot add settings for uninitialized repository");
@@ -123,6 +125,9 @@ void prepare_repo_settings(struct repository *r)
         * removed.
         */
        r->settings.command_requires_full_index = 1;
+
+       if (!repo_config_get_ulong(r, "core.deltabasecachelimit", &ulongval))
+               r->settings.delta_base_cache_limit = ulongval;
 }
 
 enum log_refs_config repo_settings_get_log_all_ref_updates(struct repository *repo)

diff --git a/repo-settings.h b/repo-settings.h
index 51d6156a1172e3a504a2c11abb134a5cff927d89..10a6f7ed64da636a5d98f135d11efa9f87b51938 100644 (file)
--- a/repo-settings.h
+++ b/repo-settings.h
@@ -57,12 +57,15 @@ struct repo_settings {
 
        int core_multi_pack_index;
        int warn_ambiguous_refs; /* lazily loaded via accessor */
+
+       size_t delta_base_cache_limit;
 };
 #define REPO_SETTINGS_INIT { \
        .index_version = -1, \
        .core_untracked_cache = UNTRACKED_CACHE_KEEP, \
        .fetch_negotiation_algorithm = FETCH_NEGOTIATION_CONSECUTIVE, \
        .warn_ambiguous_refs = -1, \
+       .delta_base_cache_limit = DEFAULT_DELTA_BASE_CACHE_LIMIT, \
 }
 
 void prepare_repo_settings(struct repository *r);