diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-02-05 14:26:16 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-05 14:26:16 -0800 |
| commit | d243a323a545da68b87149e885f2e440f0b13725 (patch) | |
| tree | 8d751162703b347ea59c34bee23e13470a9e93d0 /pack-objects.h | |
| parent | Merge branch 'jk/attr-macro-fix' (diff) | |
| parent | pack-objects: merge read_lock and lock in packing_data struct (diff) | |
| download | tgif-d243a323a545da68b87149e885f2e440f0b13725.tar.xz | |
Merge branch 'ph/pack-objects-mutex-fix'
"git pack-objects" incorrectly used uninitialized mutex, which has
been corrected.
* ph/pack-objects-mutex-fix:
pack-objects: merge read_lock and lock in packing_data struct
pack-objects: move read mutex to packing_data struct
Diffstat (limited to 'pack-objects.h')
| -rw-r--r-- | pack-objects.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pack-objects.h b/pack-objects.h index 3cd8d1f00a..6bfacc7d2c 100644 --- a/pack-objects.h +++ b/pack-objects.h @@ -148,7 +148,11 @@ struct packing_data { struct packed_git **in_pack_by_idx; struct packed_git **in_pack; - pthread_mutex_t lock; + /* + * During packing with multiple threads, protect the in-core + * object database from concurrent accesses. + */ + pthread_mutex_t odb_lock; /* * This list contains entries for bases which we know the other side @@ -168,13 +172,14 @@ struct packing_data { void prepare_packing_data(struct repository *r, struct packing_data *pdata); +/* Protect access to object database */ static inline void packing_data_lock(struct packing_data *pdata) { - pthread_mutex_lock(&pdata->lock); + pthread_mutex_lock(&pdata->odb_lock); } static inline void packing_data_unlock(struct packing_data *pdata) { - pthread_mutex_unlock(&pdata->lock); + pthread_mutex_unlock(&pdata->odb_lock); } struct object_entry *packlist_alloc(struct packing_data *pdata, |