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

Make NO_PTHREADS the sole thread configuration variable

Browse Source 
When the first piece of threaded code was introduced in commit 8ecce684, it
came with its own THREADED_DELTA_SEARCH Makefile option. Since this time,
more threaded code has come into the codebase and a NO_PTHREADS option has
also been added. Get rid of the original option as the newer, more generic
option covers everything we need.

Signed-off-by: Dan McGee <dpmcgee@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Dan McGee
2010-01-29 19:22:19 -06:00
committed by Junio C Hamano
parent b0883aa6c7
commit 7eb151d6e2
5 changed files with 13 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
builtin-pack-objects.c
View File

@ -17,7 +17,7 @@
#include "progress.h"
#include "refs.h"
#ifdef THREADED_DELTA_SEARCH
#ifndef NO_PTHREADS
#include "thread-utils.h"
#include <pthread.h>
#endif
@ -1255,7 +1255,7 @@ static int delta_cacheable(unsigned long src_size, unsigned long trg_size,
return 0;
}
#ifdef THREADED_DELTA_SEARCH
#ifndef NO_PTHREADS
static pthread_mutex_t read_mutex;
#define read_lock() pthread_mutex_lock(&read_mutex)
@ -1380,7 +1380,7 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
/*
* Handle memory allocation outside of the cache
* accounting lock. Compiler will optimize the strangeness
* away when THREADED_DELTA_SEARCH is not defined.
* away when NO_PTHREADS is defined.
*/
free(trg_entry->delta_data);
cache_lock();
@ -1567,7 +1567,7 @@ static void find_deltas(struct object_entry **list, unsigned *list_size,
free(array);
}
#ifdef THREADED_DELTA_SEARCH
#ifndef NO_PTHREADS
/*
* The main thread waits on the condition that (at least) one of the workers
@ -1899,7 +1899,7 @@ static int git_pack_config(const char *k, const char *v, void *cb)
if (delta_search_threads < 0)
die("invalid number of threads specified (%d)",
delta_search_threads);
#ifndef THREADED_DELTA_SEARCH
#ifdef NO_PTHREADS
if (delta_search_threads != 1)
warning("no threads support, ignoring %s", k);
#endif
@ -2227,7 +2227,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
delta_search_threads = strtoul(arg+10, &end, 0);
if (!arg[10] || *end || delta_search_threads < 0)
usage(pack_usage);
#ifndef THREADED_DELTA_SEARCH
#ifdef NO_PTHREADS
if (delta_search_threads != 1)
warning("no threads support, "
"ignoring %s", arg);