diff options
| author | Patrick Hogg <phogg@novamoon.net> | 2019-01-25 03:22:05 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-28 22:22:12 +0300 |
| commit | edb673cf1001eeff140370c41139aaa06e67cea0 (patch) | |
| tree | 0b21611c4c5edcb3f27f5622b64b4459f68d8699 /pack-objects.h | |
| parent | 459307b139c9a859ca0b6ca5276cf9be3d2b8e3e (diff) | |
pack-objects: merge read_lock and lock in packing_data struct
Rename the packing_data lock to obd_lock and upgrade it to a recursive
mutex to make it suitable for current read_lock usages. Additionally
remove the superfluous #ifndef NO_PTHREADS guard around mutex
initialization in prepare_packing_data as the mutex functions
themselves are already protected.
Signed-off-by: Patrick Hogg <phogg@novamoon.net>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pack-objects.h')
| -rw-r--r-- | pack-objects.h | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/pack-objects.h b/pack-objects.h index 0a038e3bc6..1667cbad8f 100644 --- a/pack-objects.h +++ b/pack-objects.h @@ -145,8 +145,11 @@ struct packing_data { struct packed_git **in_pack_by_idx; struct packed_git **in_pack; - pthread_mutex_t lock; - pthread_mutex_t read_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 @@ -166,22 +169,14 @@ struct packing_data { void prepare_packing_data(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); -} - -static inline void packing_data_read_lock(struct packing_data *pdata) -{ - pthread_mutex_lock(&pdata->read_lock); -} -static inline void packing_data_read_unlock(struct packing_data *pdata) -{ - pthread_mutex_unlock(&pdata->read_lock); + pthread_mutex_unlock(&pdata->odb_lock); } struct object_entry *packlist_alloc(struct packing_data *pdata, |