X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-pack-objects.c;h=a15906bdb2021e68a014344cad4e73e9de3367ca;hb=e5f4e214636f9c9bd36c2897634108d5ad5587a1;hp=42698d29486390f4aef727ef5771d87a95dbbfcc;hpb=367f4a4343d467ac76641362b102bc86da5cb584;p=git.git

diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index 42698d294..a15906bdb 100644
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -1301,16 +1301,22 @@ static pthread_mutex_t read_mutex = PTHREAD_MUTEX_INITIALIZER;
 #define read_lock()		pthread_mutex_lock(&read_mutex)
 #define read_unlock()		pthread_mutex_unlock(&read_mutex)
 
+static pthread_mutex_t cache_mutex = PTHREAD_MUTEX_INITIALIZER;
+#define cache_lock()		pthread_mutex_lock(&cache_mutex)
+#define cache_unlock()		pthread_mutex_unlock(&cache_mutex)
+
 static pthread_mutex_t progress_mutex = PTHREAD_MUTEX_INITIALIZER;
 #define progress_lock()		pthread_mutex_lock(&progress_mutex)
 #define progress_unlock()	pthread_mutex_unlock(&progress_mutex)
 
 #else
 
-#define read_lock()		0
-#define read_unlock()		0
-#define progress_lock()		0
-#define progress_unlock()	0
+#define read_lock()		(void)0
+#define read_unlock()		(void)0
+#define cache_lock()		(void)0
+#define cache_unlock()		(void)0
+#define progress_lock()		(void)0
+#define progress_unlock()	(void)0
 
 #endif
 
@@ -1423,17 +1429,27 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
 	trg_entry->delta_size = delta_size;
 	trg->depth = src->depth + 1;
 
+	/*
+	 * Handle memory allocation outside of the cache
+	 * accounting lock.  Compiler will optimize the strangeness
+	 * away when THREADED_DELTA_SEARCH is not defined.
+	 */
+	if (trg_entry->delta_data)
+		free(trg_entry->delta_data);
+	cache_lock();
 	if (trg_entry->delta_data) {
 		delta_cache_size -= trg_entry->delta_size;
-		free(trg_entry->delta_data);
 		trg_entry->delta_data = NULL;
 	}
-
 	if (delta_cacheable(src_size, trg_size, delta_size)) {
-		trg_entry->delta_data = xrealloc(delta_buf, delta_size);
 		delta_cache_size += trg_entry->delta_size;
-	} else
+		cache_unlock();
+		trg_entry->delta_data = xrealloc(delta_buf, delta_size);
+	} else {
+		cache_unlock();
 		free(delta_buf);
+	}
+
 	return 1;
 }
 
@@ -1597,6 +1613,7 @@ static void *threaded_find_deltas(void *arg)
 		data_requester = me;
 		pthread_mutex_unlock(&data_provider);
 		pthread_mutex_lock(&data_ready);
+		pthread_mutex_unlock(&data_request);
 
 		if (!me->list_size)
 			return NULL;
@@ -1609,7 +1626,7 @@ static void *threaded_find_deltas(void *arg)
 static void ll_find_deltas(struct object_entry **list, unsigned list_size,
 			   int window, int depth, unsigned *processed)
 {
-	struct thread_params p[delta_search_threads];
+	struct thread_params *target, p[delta_search_threads];
 	int i, ret;
 	unsigned chunk_size;
 
@@ -1645,17 +1662,17 @@ static void ll_find_deltas(struct object_entry **list, unsigned list_size,
 			sublist_size++;
 
 		pthread_mutex_lock(&data_provider);
-		data_requester->list = list;
-		data_requester->list_size = sublist_size;
+		target = data_requester;
+		target->list = list;
+		target->list_size = sublist_size;
 		pthread_mutex_unlock(&data_ready);
 
 		list += sublist_size;
 		list_size -= sublist_size;
 		if (!sublist_size) {
-			pthread_join(data_requester->thread, NULL);
+			pthread_join(target->thread, NULL);
 			i--;
 		}
-		pthread_mutex_unlock(&data_request);
 	} while (i);
 }
 
@@ -1745,6 +1762,17 @@ static int git_pack_config(const char *k, const char *v)
 		cache_max_small_delta_size = git_config_int(k, v);
 		return 0;
 	}
+	if (!strcmp(k, "pack.threads")) {
+		delta_search_threads = git_config_int(k, v);
+		if (delta_search_threads < 1)
+			die("invalid number of threads specified (%d)",
+			    delta_search_threads);
+#ifndef THREADED_DELTA_SEARCH
+		if (delta_search_threads > 1)
+			warning("no threads support, ignoring %s", k);
+#endif
+		return 0;
+	}
 	return git_default_config(k, v);
 }