kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'jd/read-cache-trace-wo-the-repository' 

A handful of inappropriate uses of the_repository have been
rewritten to use the right repository structure instance in the
read-cache.c codepath.

* jd/read-cache-trace-wo-the-repository:
  read-cache: use istate->repo for trace2 logging
maint
Junio C Hamano 2026-04-07 14:59:25 -07:00
parent 1adf5bca8c a7aca15677
commit 716b9db0d3
1 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
read-cache.c
View File

@ -2309,13 +2309,9 @@ int do_read_index(struct index_state *istate, const char *path, int must_exist)
}
munmap((void *)mmap, mmap_size);

/*
* TODO trace2: replace "the_repository" with the actual repo instance
* that is associated with the given "istate".
*/
trace2_data_intmax("index", the_repository, "read/version",
trace2_data_intmax("index", istate->repo, "read/version",
istate->version);
trace2_data_intmax("index", the_repository, "read/cache_nr",
trace2_data_intmax("index", istate->repo, "read/cache_nr",
istate->cache_nr);

/*
@ -2360,16 +2356,12 @@ int read_index_from(struct index_state *istate, const char *path,
if (istate->initialized)
return istate->cache_nr;

/*
* TODO trace2: replace "the_repository" with the actual repo instance
* that is associated with the given "istate".
*/
trace2_region_enter_printf("index", "do_read_index", the_repository,
trace2_region_enter_printf("index", "do_read_index", istate->repo,
"%s", path);
trace_performance_enter();
ret = do_read_index(istate, path, 0);
trace_performance_leave("read cache %s", path);
trace2_region_leave_printf("index", "do_read_index", the_repository,
trace2_region_leave_printf("index", "do_read_index", istate->repo,
"%s", path);

split_index = istate->split_index;
@ -3096,13 +3088,9 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
istate->timestamp.nsec = ST_MTIME_NSEC(st);
trace_performance_since(start, "write index, changed mask = %x", istate->cache_changed);

/*
* TODO trace2: replace "the_repository" with the actual repo instance
* that is associated with the given "istate".
*/
trace2_data_intmax("index", the_repository, "write/version",
trace2_data_intmax("index", istate->repo, "write/version",
istate->version);
trace2_data_intmax("index", the_repository, "write/cache_nr",
trace2_data_intmax("index", istate->repo, "write/cache_nr",
istate->cache_nr);

ret = 0;
@ -3144,14 +3132,10 @@ static int do_write_locked_index(struct index_state *istate,
return ret;
}

/*
* TODO trace2: replace "the_repository" with the actual repo instance
* that is associated with the given "istate".
*/
trace2_region_enter_printf("index", "do_write_index", the_repository,
trace2_region_enter_printf("index", "do_write_index", istate->repo,
"%s", get_lock_file_path(lock));
ret = do_write_index(istate, lock->tempfile, write_extensions, flags);
trace2_region_leave_printf("index", "do_write_index", the_repository,
trace2_region_leave_printf("index", "do_write_index", istate->repo,
"%s", get_lock_file_path(lock));

if (was_full)