mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pack-objects: merge read_lock and lock in packing_data struct

Browse Source 
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>
This commit is contained in:
Patrick Hogg
2019-01-24 19:22:05 -05:00
committed by Junio C Hamano
parent 459307b139
commit edb673cf10
3 changed files with 19 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pack-objects.h
View File

@ -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,