summaryrefslogtreecommitdiff
path: root/pack-objects.h
diff options
context:
space:
mode:
Diffstat (limited to 'pack-objects.h')
-rw-r--r--pack-objects.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/pack-objects.h b/pack-objects.h
index 3cd8d1f..6bfacc7 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,