packfile: avoid using the 'the_repository' global variable
PATCH v10 6/10 packfile: pass down repository to `for_each_packed_object`
In reply to Karthik NayakThe function for_each_packed_object currently relies on the global variable the_repository. To eliminate global variable usage in packfile.c, we should progressively shift the dependency on the_repository to higher layers. Let's remove its usage from this function and closely related function is_promisor_object.
--- builtin/cat-file.c | 7 ++++--- builtin/fsck.c | 18 +++++++++++------- builtin/pack-objects.c | 7 +++++-- builtin/repack.c | 2 +- builtin/rev-list.c | 2 +- commit-graph.c | 2 +- fsck.c | 2 +- list-objects.c | 4 ++-- object-store-ll.h | 4 ++-- packfile.c | 14 +++++++------- packfile.h | 2 +- promisor-remote.c | 2 +- reachable.c | 2 +- revision.c | 9 +++++---- tag.c | 2 +- 15 files changed, 44 insertions(+), 35 deletions(-)
builtin/cat-file.c +4 -3
@@ -827,15 +827,16 @@ static int batch_objects(struct batch_options *opt) cb.seen = &seen;for_each_loose_object (batch_unordered_loose, &cb,0 ); -for_each_packed_object (batch_unordered_packed, &cb, -FOR_EACH_OBJECT_PACK_ORDER ); +for_each_packed_object (the_repository, batch_unordered_packed, + &cb,FOR_EACH_OBJECT_PACK_ORDER );oidset_clear (&seen); }else {struct oid_array sa =OID_ARRAY_INIT ;for_each_loose_object (collect_loose_object, &sa,0 ); -for_each_packed_object (collect_packed_object, &sa,0 ); +for_each_packed_object (the_repository, collect_packed_object, + &sa,0 );oid_array_for_each_unique (&sa, batch_object_cb, &cb);
builtin/fsck.c +11 -7
@@ -150,7 +150,7 @@ static int mark_object(struct object *obj, enum object_type type,return 0 ; obj->flags |=REACHABLE ; -if (is_promisor_object (&obj->oid)) +if (is_promisor_object (the_repository, &obj->oid))/* * Further recursion does not need to be performed on this * object since it is a promisor object (so it does not need to
@@ -270,7 +270,7 @@ static void check_reachable_object(struct object *obj)* do a full fsck */ if (!(obj->flags &HAS_OBJ )) { -if (is_promisor_object (&obj->oid)) +if (is_promisor_object (the_repository, &obj->oid))return ;if (has_object_pack (the_repository, &obj->oid))return ;/* it is in pack - forget about it */
@@ -391,7 +391,10 @@ static void check_connectivity(void)* traversal. */ for_each_loose_object (mark_loose_unreachable_referents,NULL ,0 ); -for_each_packed_object (mark_packed_unreachable_referents,NULL ,0 ); +for_each_packed_object (the_repository, + mark_packed_unreachable_referents, +NULL , +0 ); }/* Look up all the requirements, warn about missing objects.. */
@@ -488,7 +491,7 @@ static void fsck_handle_reflog_oid(const char *refname, struct object_id *oid, refname, timestamp); obj->flags |=USED ;mark_object_reachable (obj); - }else if (!is_promisor_object (oid)) { + }else if (!is_promisor_object (the_repository, oid)) {error (_ ("%s: invalid reflog entry %s" ), refname,oid_to_hex (oid)); errors_found |=ERROR_REACHABLE ;
@@ -531,7 +534,7 @@ static int fsck_handle_ref(const char *refname, const char *referent UNUSED, con obj =parse_object (the_repository, oid);if (!obj) { -if (is_promisor_object (oid)) { +if (is_promisor_object (the_repository, oid)) {/* * Increment default_refs anyway, because this is a * valid ref.
@@ -966,7 +969,8 @@ int cmd_fsck(int argc,if (connectivity_only) {for_each_loose_object (mark_loose_for_connectivity,NULL ,0 ); -for_each_packed_object (mark_packed_for_connectivity,NULL ,0 ); +for_each_packed_object (the_repository, + mark_packed_for_connectivity,NULL ,0 ); }else {prepare_alt_odb (the_repository);for (odb = the_repository->objects->odb; odb; odb = odb->next)
@@ -1011,7 +1015,7 @@ int cmd_fsck(int argc, &oid);if (!obj || !(obj->flags &HAS_OBJ )) { -if (is_promisor_object (&oid)) +if (is_promisor_object (the_repository, &oid))continue ;error (_ ("%s: object missing" ),oid_to_hex (&oid)); errors_found |=ERROR_OBJECT ;
builtin/pack-objects.c +5 -2
@@ -3858,7 +3858,8 @@ static void show_object__ma_allow_promisor(struct object *obj, const char *name,* Quietly ignore EXPECTED missing objects. This avoids problems with * staging them now and getting an odd error later. */ -if (!has_object (the_repository, &obj->oid,0 ) &&is_promisor_object (&obj->oid)) +if (!has_object (the_repository, &obj->oid,0 ) && +is_promisor_object (to_pack.repo, &obj->oid))return ;show_object (obj, name, data);
@@ -3927,7 +3928,9 @@ static int add_object_in_unpacked_pack(const struct object_id *oid,static void add_objects_in_unpacked_packs (void ) { - if (for_each_packed_object(add_object_in_unpacked_pack, NULL, + if (for_each_packed_object(to_pack.repo, + add_object_in_unpacked_pack, + NULL, FOR_EACH_OBJECT_PACK_ORDER | FOR_EACH_OBJECT_LOCAL_ONLY | FOR_EACH_OBJECT_SKIP_IN_CORE_KEPT_PACKS |
builtin/repack.c +1 -1
@@ -404,7 +404,7 @@ static void repack_promisor_objects(const struct pack_objects_args *args,* {type -> existing pack order} ordering when computing deltas instead * of a {type -> size} ordering, which may produce better deltas. */ -for_each_packed_object (write_oid, &cmd, +for_each_packed_object (the_repository, write_oid, &cmd,FOR_EACH_OBJECT_PROMISOR_ONLY );if (cmd.in ==-1 ) {
builtin/rev-list.c +1 -1
@@ -121,7 +121,7 @@ static inline void finish_object__ma(struct object *obj)return ;case MA_ALLOW_PROMISOR : -if (is_promisor_object (&obj->oid)) +if (is_promisor_object (the_repository, &obj->oid))return ;die ("unexpected missing %s object '%s'" ,type_name (obj->type),oid_to_hex (&obj->oid));
commit-graph.c +1 -1
@@ -1960,7 +1960,7 @@ static void fill_oids_from_all_packs(struct write_commit_graph_context *ctx) ctx->progress =start_delayed_progress (_ ("Finding commits for commit graph among packed objects" ), ctx->approx_nr_objects); -for_each_packed_object (add_packed_commits, ctx, +for_each_packed_object (ctx->r, add_packed_commits, ctx,FOR_EACH_OBJECT_PACK_ORDER );if (ctx->progress_done < ctx->approx_nr_objects)display_progress (ctx->progress, ctx->approx_nr_objects);
fsck.c +1 -1
@@ -1295,7 +1295,7 @@ static int fsck_blobs(struct oidset *blobs_found, struct oidset *blobs_done, buf =repo_read_object_file (the_repository, oid, &type, &size);if (!buf) { -if (is_promisor_object (oid)) +if (is_promisor_object (the_repository, oid))continue ; ret |= report(options, oid, OBJ_BLOB, msg_missing,
list-objects.c +2 -2
@@ -75,7 +75,7 @@ static void process_blob(struct traversal_context *ctx,*/ if (ctx->revs->exclude_promisor_objects && !repo_has_object_file (the_repository, &obj->oid) && -is_promisor_object (&obj->oid)) +is_promisor_object (ctx->revs->repo, &obj->oid))return ; pathlen = path->len;
@@ -180,7 +180,7 @@ static void process_tree(struct traversal_context *ctx,* an incomplete list of missing objects. */ if (revs->exclude_promisor_objects && -is_promisor_object (&obj->oid)) +is_promisor_object (revs->repo, &obj->oid))return ;if (!revs->do_not_die_on_missing_objects)
object-store-ll.h +2 -2
@@ -550,7 +550,7 @@ typedef int each_packed_object_fn(const struct object_id *oid,int for_each_object_in_pack (struct packed_git *p,each_packed_object_fn ,void *data,enum for_each_object_flags flags); -int for_each_packed_object (each_packed_object_fn ,void *, -enum for_each_object_flags flags); +int for_each_packed_object (struct repository *repo,each_packed_object_fn cb, +void *data,enum for_each_object_flags flags);#endif /* OBJECT_STORE_LL_H */
packfile.c +7 -7
@@ -2200,15 +2200,15 @@ int for_each_object_in_pack(struct packed_git *p,return r; } -int for_each_packed_object (each_packed_object_fn cb,void *data, -enum for_each_object_flags flags) +int for_each_packed_object (struct repository *repo,each_packed_object_fn cb, +void *data,enum for_each_object_flags flags) {struct packed_git *p;int r =0 ;int pack_errors =0 ; -prepare_packed_git (the_repository); -for (p =get_all_packs (the_repository); p; p = p->next) { +prepare_packed_git (repo); +for (p =get_all_packs (repo); p; p = p->next) {if ((flags &FOR_EACH_OBJECT_LOCAL_ONLY ) && !p->pack_local)continue ; if ((flags & FOR_EACH_OBJECT_PROMISOR_ONLY) &&
@@ -2286,14 +2286,14 @@ static int add_promisor_object(const struct object_id *oid,return 0 ; } -int is_promisor_object (const struct object_id *oid) +int is_promisor_object (struct repository *r,const struct object_id *oid) {static struct oidset promisor_objects;static int promisor_objects_prepared;if (!promisor_objects_prepared) { -if (repo_has_promisor_remote (the_repository)) { -for_each_packed_object (add_promisor_object, +if (repo_has_promisor_remote (r)) { +for_each_packed_object (r, add_promisor_object, &promisor_objects,FOR_EACH_OBJECT_PROMISOR_ONLY |FOR_EACH_OBJECT_PACK_ORDER );
packfile.h +1 -1
@@ -201,7 +201,7 @@ int has_object_kept_pack(struct repository *r, const struct object_id *oid,* Return 1 if an object in a promisor packfile is or refers to the given * object, 0 otherwise. */ -int is_promisor_object (const struct object_id *oid); +int is_promisor_object (struct repository *r,const struct object_id *oid);/* * Expose a function for fuzz testing.
promisor-remote.c +1 -1
@@ -283,7 +283,7 @@ void promisor_remote_get_direct(struct repository *repo, }for (i =0 ; i < remaining_nr; i++) { -if (is_promisor_object (&remaining_oids[i])) +if (is_promisor_object (repo, &remaining_oids[i]))die (_ ("could not fetch %s from promisor remote" ),oid_to_hex (&remaining_oids[i])); }
reachable.c +1 -1
@@ -324,7 +324,7 @@ int add_unseen_recent_objects_to_traversal(struct rev_info *revs,if (ignore_in_core_kept_packs) flags |=FOR_EACH_OBJECT_SKIP_IN_CORE_KEPT_PACKS ; - r =for_each_packed_object (add_recent_packed, &data, flags); + r =for_each_packed_object (revs->repo, add_recent_packed, &data, flags); done:oidset_clear (&data.extra_recent_oids);
revision.c +5 -4
@@ -390,7 +390,8 @@ static struct object *get_reference(struct rev_info *revs, const char *name,if (!object) {if (revs->ignore_missing)return NULL ; -if (revs->exclude_promisor_objects &&is_promisor_object (oid)) +if (revs->exclude_promisor_objects && +is_promisor_object (revs->repo, oid))return NULL ;if (revs->do_not_die_on_missing_objects) {oidset_insert (&revs->missing_commits, oid);
@@ -432,7 +433,7 @@ static struct commit *handle_commit(struct rev_info *revs,if (revs->ignore_missing_links || (flags &UNINTERESTING ))return NULL ;if (revs->exclude_promisor_objects && -is_promisor_object (&tag->tagged->oid)) +is_promisor_object (revs->repo, &tag->tagged->oid))return NULL ;if (revs->do_not_die_on_missing_objects && oid) {oidset_insert (&revs->missing_commits, oid);
@@ -1211,7 +1212,7 @@ static int process_parents(struct rev_info *revs, struct commit *commit, revs->do_not_die_on_missing_objects;if (repo_parse_commit_gently (revs->repo, p, gently) <0 ) {if (revs->exclude_promisor_objects && -is_promisor_object (&p->object.oid)) { +is_promisor_object (revs->repo, &p->object.oid)) {if (revs->first_parent_only)break ;continue ;
@@ -3915,7 +3916,7 @@ int prepare_revision_walk(struct rev_info *revs) revs->treesame.name ="treesame" ;if (revs->exclude_promisor_objects) { -for_each_packed_object (mark_uninteresting, revs, +for_each_packed_object (revs->repo, mark_uninteresting, revs,FOR_EACH_OBJECT_PROMISOR_ONLY ); }
tag.c +1 -1
@@ -84,7 +84,7 @@ struct object *deref_tag(struct repository *r, struct object *o, const char *war o =NULL ; }if (!o && warn) { -if (last_oid &&is_promisor_object (last_oid)) +if (last_oid &&is_promisor_object (r, last_oid))return NULL ;if (!warnlen) warnlen =strlen (warn);
Signature · 1 line
2.47.1
PATCH v10 7/10 config: make `delta_base_cache_limit` a non-global variable
In reply to Karthik NayakThe 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.
--- builtin/gc.c | 12 +++++++++++- builtin/index-pack.c | 10 +++++++--- config.c | 5 ----- environment.c | 1 - environment.h | 1 - pack-objects.h | 3 ++- pack-write.c | 1 + pack.h | 2 ++ packfile.c | 10 ++++++++-- repo-settings.c | 5 +++++ repo-settings.h | 3 +++ 11 files changed, 39 insertions(+), 14 deletions(-)
builtin/gc.c +11 -1
@@ -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;
builtin/index-pack.c +7 -3
@@ -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);
config.c +0 -5
@@ -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 ;
environment.c +0 -1
@@ -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;
environment.h +0 -1
@@ -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;
pack-objects.h +2 -1
@@ -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
pack-write.c +1 -0
@@ -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)
pack.h +2 -0
@@ -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 *);
packfile.c +8 -2
@@ -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);
repo-settings.c +5 -0
@@ -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)
repo-settings.h +3 -0
@@ -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);
Signature · 1 line
2.47.1
PATCH v10 8/10 config: make `packed_git_(limit|window_size)` non-global variables
In reply to Karthik NayakThe variables packed_git_window_size and packed_git_limit are global config variables used in the packfile.c file. Since it is only used in this file, let's change it from being a global config variable to a local variable for the subsystem.
With this, we rid packfile.c from all global variable usage and this means we can also remove the USE_THE_REPOSITORY_VARIABLE guard from the file.
--- builtin/fast-import.c | 4 ++-- config.c | 17 ----------------- environment.c | 2 -- packfile.c | 23 +++++++++++++++-------- packfile.h | 2 +- repo-settings.c | 13 +++++++++++++ repo-settings.h | 4 ++++ 7 files changed, 35 insertions(+), 30 deletions(-)
builtin/fast-import.c +2 -2
@@ -3539,7 +3539,7 @@ static void parse_argv(void)int cmd_fast_import (int argc,const char **argv,const char *prefix, - struct repository *repo UNUSED) +struct repository *repo) {unsigned int i;
@@ -3660,7 +3660,7 @@ int cmd_fast_import(int argc,fprintf (stderr," pools: %10lu KiB\n" , (unsigned long )((tree_entry_allocd + fi_mem_pool.pool_alloc) /1024 ));fprintf (stderr," objects: %10" PRIuMAX" KiB\n" , (alloc_count*sizeof (struct object_entry ))/1024 );fprintf (stderr,"---------------------------------------------------------------------\n" ); -pack_report (); +pack_report (repo);fprintf (stderr,"---------------------------------------------------------------------\n" );fprintf (stderr,"\n" ); }
config.c +0 -17
@@ -1493,28 +1493,11 @@ static int git_default_core_config(const char *var, const char *value,return 0 ; } -if (!strcmp (var,"core.packedgitwindowsize" )) { -int pgsz_x2 =getpagesize () *2 ; - packed_git_window_size =git_config_ulong (var, value, ctx->kvi); - -/* This value must be multiple of (pagesize * 2) */ - packed_git_window_size /= pgsz_x2; -if (packed_git_window_size <1 ) - packed_git_window_size =1 ; - packed_git_window_size *= pgsz_x2; -return 0 ; - } -if (!strcmp (var,"core.bigfilethreshold" )) { big_file_threshold =git_config_ulong (var, value, ctx->kvi);return 0 ; } -if (!strcmp (var,"core.packedgitlimit" )) { - packed_git_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 ;
environment.c +0 -2
@@ -49,8 +49,6 @@ int fsync_object_files = -1;int use_fsync =-1 ;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 ;unsigned long big_file_threshold =512 *1024 *1024 ;char *editor_program;char *askpass_program;
packfile.c +15 -8
@@ -1,4 +1,3 @@ -#define USE_THE_REPOSITORY_VARIABLE #include "git-compat-util.h" #include "environment.h"
@@ -46,15 +45,15 @@ static size_t pack_mapped;#define SZ_FMT PRIuMAXstatic inline uintmax_t sz_fmt (size_t s) {return s; } -void pack_report (void ) +void pack_report (struct repository *repo) {fprintf (stderr,"pack_report: getpagesize() = %10" SZ_FMT "\n" "pack_report: core.packedGitWindowSize = %10" SZ_FMT "\n" "pack_report: core.packedGitLimit = %10" SZ_FMT "\n" ,sz_fmt (getpagesize ()), -sz_fmt (packed_git_window_size), -sz_fmt (packed_git_limit)); +sz_fmt (repo->settings.packed_git_window_size), +sz_fmt (repo->settings.packed_git_limit));fprintf (stderr,"pack_report: pack_used_ctr = %10u\n" "pack_report: pack_mmap_calls = %10u\n"
@@ -650,8 +649,15 @@ unsigned char *use_pack(struct packed_git *p,break ; }if (!win) { -size_t window_align = packed_git_window_size /2 ; +size_t window_align;off_t len; +struct repo_settings *settings; + +/* lazy load the settings in case it hasn't been setup */ +prepare_repo_settings (p->repo); + settings = &p->repo->settings; + + window_align = settings->packed_git_window_size /2 ;if (p->pack_fd ==-1 &&open_packed_git (p))die ("packfile %s cannot be accessed" , p->pack_name);
@@ -659,11 +665,12 @@ unsigned char *use_pack(struct packed_git *p,CALLOC_ARRAY (win,1 ); win->offset = (offset / window_align) * window_align; len = p->pack_size - win->offset; -if (len > packed_git_window_size) - len = packed_git_window_size; +if (len > settings->packed_git_window_size) + len = settings->packed_git_window_size; win->len = (size_t )len; pack_mapped += win->len; -while (packed_git_limit < pack_mapped + +while (settings->packed_git_limit < pack_mapped &&unuse_one_window (p)) ;/* nothing */ win->base = xmmap_gently(NULL, win->len,
packfile.h +1 -1
@@ -89,7 +89,7 @@ unsigned long repo_approximate_object_count(struct repository *r);struct packed_git *find_oid_pack (const struct object_id *oid,struct packed_git *packs); -void pack_report (void ); +void pack_report (struct repository *repo);/* * mmap the index file for the specified packfile (if it is not
repo-settings.c +13 -0
@@ -128,6 +128,19 @@ void prepare_repo_settings(struct repository *r)if (!repo_config_get_ulong (r,"core.deltabasecachelimit" , &ulongval)) r->settings.delta_base_cache_limit = ulongval; + +if (!repo_config_get_ulong (r,"core.packedgitwindowsize" , &ulongval)) { +int pgsz_x2 =getpagesize () *2 ; + +/* This value must be multiple of (pagesize * 2) */ + ulongval /= pgsz_x2; +if (ulongval <1 ) + ulongval =1 ; + r->settings.packed_git_window_size = ulongval * pgsz_x2; + } + +if (!repo_config_get_ulong (r,"core.packedgitlimit" , &ulongval)) + r->settings.packed_git_limit = ulongval; }enum log_refs_config repo_settings_get_log_all_ref_updates (struct repository *repo)
repo-settings.h +4 -0
@@ -59,6 +59,8 @@ struct repo_settings {int warn_ambiguous_refs;/* lazily loaded via accessor */ size_t delta_base_cache_limit; +size_t packed_git_window_size; +size_t packed_git_limit; };#define REPO_SETTINGS_INIT { \ .index_version = -1, \
@@ -66,6 +68,8 @@ struct repo_settings { .fetch_negotiation_algorithm = FETCH_NEGOTIATION_CONSECUTIVE, \ .warn_ambiguous_refs = -1, \ .delta_base_cache_limit = DEFAULT_DELTA_BASE_CACHE_LIMIT, \ + .packed_git_window_size = DEFAULT_PACKED_GIT_WINDOW_SIZE, \ + .packed_git_limit = DEFAULT_PACKED_GIT_LIMIT, \ }void prepare_repo_settings (struct repository *r);
Signature · 1 line
2.47.1
PATCH v10 9/10 midx: add repository to `multi_pack_index` struct
In reply to Karthik NayakThe multi_pack_index struct represents the MIDX for a repository. Here, we add a pointer to the repository in this struct, allowing direct use of the repository variable without relying on the global the_repository struct.
With this addition, we can determine the repository associated with a bitmap_index struct. A bitmap_index points to either a packed_git or a multi_pack_index, both of which have direct repository references. To support this, we introduce a static helper function, bitmap_repo, in pack-bitmap.c, which retrieves a repository given a bitmap_index.
With this, we clear up all usages of the_repository within pack-bitmap.c and also remove the USE_THE_REPOSITORY_VARIABLE definition. Bringing us another step closer to remove all global variable usage.
Although this change also opens up the potential to clean up midx.c, doing so would require additional refactoring to pass the repository struct to functions where the MIDX struct is created: a task better suited for future patches.
--- midx.c | 1 + midx.h | 3 ++ pack-bitmap.c | 90 +++++++++++++++++++++++++++++++-------------------- 3 files changed, 59 insertions(+), 35 deletions(-)
midx.c +1 -0
@@ -131,6 +131,7 @@ static struct multi_pack_index *load_multi_pack_index_one(const char *object_dir m->data = midx_map; m->data_len = midx_size; m->local = local; + m->repo = the_repository; m->signature =get_be32 (m->data);if (m->signature !=MIDX_SIGNATURE )
midx.h +3 -0
@@ -71,6 +71,9 @@ struct multi_pack_index {const char **pack_names;struct packed_git **packs; + +struct repository *repo; +char object_dir[FLEX_ARRAY ]; };
pack-bitmap.c +55 -35
251 lines not on this page · raw message
Signature · 1 line
2.47.1
PATCH v10 10/10 packfile.c: remove unnecessary prepare_packed_git() call
In reply to Karthik NayakFrom: Taylor Blau <[email protected]>
In 454ea2e4d7 (treewide: use get_all_packs, 2018-08-20) we converted existing calls to both:
- get_packed_git(), as well as
- the_repository->objects->packed_git
, to instead use the new get_all_packs() function.
In the instance that this commit addresses, there was a preceding call to prepare_packed_git(), which dates all the way back to 660c889e46 (sha1_file: add for_each iterators for loose and packed objects, 2014-10-15) when its caller (for_each_packed_object()) was first introduced.
This call could have been removed in 454ea2e4d7, since get_all_packs() itself calls prepare_packed_git(). But the translation in 454ea2e4d7 was (to the best of my knowledge) a find-and-replace rather than inspecting each individual caller.
Having an extra prepare_packed_git() call here is harmless, since it will notice that we have already set the 'packed_git_initialized' field and the call will be a noop. So we're only talking about a few dozen CPU cycles to set up and tear down the stack frame.
But having a lone prepare_packed_git() call immediately before a call to get_all_packs() confused me, so let's remove it as redundant to avoid more confusion in the future.
--- packfile.c | 1 - 1 file changed, 1 deletion(-)
packfile.c +0 -1
@@ -2220,7 +2220,6 @@ int for_each_packed_object(struct repository *repo, each_packed_object_fn cb,int r =0 ;int pack_errors =0 ; -prepare_packed_git (repo);for (p =get_all_packs (repo); p; p = p->next) {if ((flags &FOR_EACH_OBJECT_LOCAL_ONLY ) && !p->pack_local)continue ;
Signature · 1 line
2.47.1
Quoted 29 lines · Karthik Nayak
Range-diff against v9:
1:d1fdd6996a! 1:d6d571c58epackfile: add repository to structpacked_git
@@ Commit message
on the globalthe_repositoryobject inpackfile.cby
simply using
repository information now readily available in the struct.- We do need to consider that a pack file could be part of the
alternates
+ We do need to consider that a packfile could be part of the
alternates
of a repository, but considering that we only have one
repository struct
- and also that we currently anyways use 'the_repository'. We
should be
+ and also that we currently anyways use 'the_repository', we
should be
OK with this change.We also modify
alloc_packed_gitto ensure that the
repository is added
2:65c09858ce= 2:fa69763468packfile: userepositoryfrompacked_gitdirectly
3:80632934d1! 3:c6acbece46packfile: passrepositoryto static
function in the file
@@ Commit message
packfile: passrepositoryto static function in the file
Quoted 4 lines
Some of the static functions in the
packfile.caccess global
- variables, which can simply be avoiding by passing therepository
+ variables, which can simply be avoided by passing therepository
struct down to them. Let's do that.
Nice, thank you.
Quoted 1 line · Kristoffer Haugsbakk
Nice, thank you.
Yeah, together with a few responses from Toon and Patrick, this topic seems to be very well done by now. Let me mark it for 'next'.
Thanks, all.