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

Merge branch 'jk/index-pack-lsan-false-positive-fix' into maint-2.43 

Fix false positive reported by leak sanitizer.

* jk/index-pack-lsan-false-positive-fix:
  index-pack: spawn threads atomically
maint
Junio C Hamano 2024-02-08 16:22:12 -08:00
parent 16a830f6c2 993d38a066
commit a064af6ef4
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/index-pack.c
View File

@ -1255,6 +1255,7 @@ static void resolve_deltas(void)
base_cache_limit = delta_base_cache_limit * nr_threads; base_cache_limit = delta_base_cache_limit * nr_threads;
if (nr_threads > 1 || getenv("GIT_FORCE_THREADS")) { if (nr_threads > 1 || getenv("GIT_FORCE_THREADS")) {
init_thread(); init_thread();
work_lock();
for (i = 0; i < nr_threads; i++) { for (i = 0; i < nr_threads; i++) {
int ret = pthread_create(&thread_data[i].thread, NULL, int ret = pthread_create(&thread_data[i].thread, NULL,
threaded_second_pass, thread_data + i); threaded_second_pass, thread_data + i);
@ -1262,6 +1263,7 @@ static void resolve_deltas(void)
die(_("unable to create thread: %s"), die(_("unable to create thread: %s"),
strerror(ret)); strerror(ret));
} }
work_unlock();
for (i = 0; i < nr_threads; i++) for (i = 0; i < nr_threads; i++)
pthread_join(thread_data[i].thread, NULL); pthread_join(thread_data[i].thread, NULL);
cleanup_thread(); cleanup_thread();