fix threaded delta search locking
Found by Jeff King. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nicolas Pitre committed
Sep 10, 2007 at 08:40 UTC
b81d9af71e1c6460511322c276b4b7ad7c86c444
1 file changed
+6
-5
builtin-pack-objects.c
+6
-5
@@ -1597,6 +1597,7 @@ static void *threaded_find_deltas(void *arg)
1597
data_requester = me;
1598
pthread_mutex_unlock(&data_provider);
1599
pthread_mutex_lock(&data_ready);
1600
+ pthread_mutex_unlock(&data_request);
1601
1602
if (!me->list_size)
1603
return NULL;
@@ -1609,7 +1610,7 @@ static void *threaded_find_deltas(void *arg)
1610
static void ll_find_deltas(struct object_entry **list, unsigned list_size,
1611
int window, int depth, unsigned *processed)
1612
{
1612
- struct thread_params p[delta_search_threads];
1613
+ struct thread_params *target, p[delta_search_threads];
1614
int i, ret;
1615
unsigned chunk_size;
1616
@@ -1645,17 +1646,17 @@ static void ll_find_deltas(struct object_entry **list, unsigned list_size,
1646
sublist_size++;
1647
1648
pthread_mutex_lock(&data_provider);
1648
- data_requester->list = list;
1649
- data_requester->list_size = sublist_size;
1649
+ target = data_requester;
1650
+ target->list = list;
1651
+ target->list_size = sublist_size;
1652
pthread_mutex_unlock(&data_ready);
1653
1654
list += sublist_size;
1655
list_size -= sublist_size;
1656
if (!sublist_size) {
1655
- pthread_join(data_requester->thread, NULL);
1657
+ pthread_join(target->thread, NULL);
1658
i--;
1659
}
1658
- pthread_mutex_unlock(&data_request);
1660
} while (i);
1661
}
1662