summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAndreas Ericsson <ae@op5.se>2008-02-22 20:11:56 -0600
committerJunio C Hamano <gitster@pobox.com>2008-02-23 12:00:32 -0800
commit833e3df17188e48b2d31db0966a4051dad5e03b9 (patch)
tree265fb9405efb644ff564ac1b77991d62795006a2 /Makefile
parent923d44aeb7cb6d21eeb459fdc1b58137e37c2b1c (diff)
downloadgit-833e3df17188e48b2d31db0966a4051dad5e03b9.tar.gz
pack-objects: Add runtime detection of online CPU's
Packing objects can be done in parallell nowadays, but it's only done if the config option pack.threads is set to a value above 1. Because of that, the code-path used is often not the most optimal one. This patch adds a routine to detect the number of online CPU's at runtime (online_cpus()). When pack.threads (or --threads=) is given a value of 0, the number of threads is set to the number of online CPU's. This feature is also documented. As per Nicolas Pitre's recommendations, the default is still to run pack-objects single-threaded unless explicitly activated, either by configuration or by command line parameter. The routine online_cpus() is a rework of "numcpus.c", written by one Philip Willoughby <pgw99@doc.ic.ac.uk>. numcpus.c is in the public domain and can presently be downloaded from http://csgsoft.doc.ic.ac.uk/numcpus/ Signed-off-by: Andreas Ericsson <ae@op5.se> Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index d33a556ffe..2dc82476e5 100644
--- a/Makefile
+++ b/Makefile
@@ -741,6 +741,7 @@ endif
ifdef THREADED_DELTA_SEARCH
BASIC_CFLAGS += -DTHREADED_DELTA_SEARCH
EXTLIBS += -lpthread
+ LIB_OBJS += thread-utils.o
endif
ifeq ($(TCLTK_PATH),)