Update the xargs call so that if your large repo contains symlinks, test-tool chmtime failure does not end the script. On Linux Test this tree upstream/master --------------------------------------------------------------------------------------------------------- 7519.4: status (fsmonitor=fsmonitor-watchman) 0.52(0.43+0.10) 0.53(0.49+0.05) +1.9% 7519.5: status -uno (fsmonitor=fsmonitor-watchman) 0.21(0.15+0.07) 0.22(0.13+0.09) +4.8% 7519.6: status -uall (fsmonitor=fsmonitor-watchman) 1.65(0.93+0.71) 1.69(1.03+0.65) +2.4% 7519.7: status (dirty) (fsmonitor=fsmonitor-watchman) 11.99(11.34+1.58) 11.95(11.02+1.79) -0.3% 7519.8: diff (fsmonitor=fsmonitor-watchman) 0.25(0.17+0.26) 0.25(0.18+0.26) +0.0% 7519.9: diff HEAD (fsmonitor=fsmonitor-watchman) 0.39(0.25+0.34) 0.89(0.35+0.74) +128.2% 7519.10: diff -- 0_files (fsmonitor=fsmonitor-watchman) 0.16(0.13+0.04) 0.16(0.12+0.05) +0.0% 7519.11: diff -- 10_files (fsmonitor=fsmonitor-watchman) 0.16(0.12+0.05) 0.16(0.12+0.05) +0.0% 7519.12: diff -- 100_files (fsmonitor=fsmonitor-watchman) 0.16(0.12+0.05) 0.16(0.12+0.05) +0.0% 7519.13: diff -- 1000_files (fsmonitor=fsmonitor-watchman) 0.16(0.11+0.06) 0.16(0.12+0.05) +0.0% 7519.14: diff -- 10000_files (fsmonitor=fsmonitor-watchman) 0.18(0.13+0.06) 0.17(0.10+0.08) -5.6% 7519.15: add (fsmonitor=fsmonitor-watchman) 2.25(1.53+0.68) 2.25(1.47+0.74) +0.0% 7519.18: status (fsmonitor=disabled) 0.88(0.73+1.03) 0.89(0.67+1.08) +1.1% 7519.19: status -uno (fsmonitor=disabled) 0.45(0.43+0.89) 0.45(0.34+0.98) +0.0% 7519.20: status -uall (fsmonitor=disabled) 1.88(1.16+1.58) 1.88(1.22+1.51) +0.0% 7519.21: status (dirty) (fsmonitor=disabled) 7.53(7.05+2.11) 7.53(6.98+2.04) +0.0% 7519.22: diff (fsmonitor=disabled) 0.42(0.37+0.92) 0.42(0.38+0.91) +0.0% 7519.23: diff HEAD (fsmonitor=disabled) 0.44(0.41+0.90) 0.44(0.40+0.91) +0.0% 7519.24: diff -- 0_files (fsmonitor=disabled) 0.13(0.09+0.05) 0.13(0.09+0.05) +0.0% 7519.25: diff -- 10_files (fsmonitor=disabled) 0.13(0.10+0.04) 0.13(0.10+0.04) +0.0% 7519.26: diff -- 100_files (fsmonitor=disabled) 0.13(0.09+0.05) 0.13(0.10+0.04) +0.0% 7519.27: diff -- 1000_files (fsmonitor=disabled) 0.13(0.09+0.06) 0.13(0.09+0.05) +0.0% 7519.28: diff -- 10000_files (fsmonitor=disabled) 0.14(0.11+0.05) 0.14(0.10+0.05) +0.0% 7519.29: add (fsmonitor=disabled) 2.43(1.61+1.64) 2.43(1.69+1.57) +0.0% On linux (2.29.2 vs w/ this patch): nipunn@nipunn-dbx:~/src/server3$ strace -f -c git diff 2>&1 | grep lstat 0.04 0.000063 3 20 6 lstat nipunn@nipunn-dbx:~/src/server3$ strace -f -c git diff HEAD 2>&1 | grep lstat 94.98 5.242262 10 523783 13 lstat nipunn@nipunn-dbx:~/src/server3$ strace -f -c ../git/bin-wrappers/git diff 2>&1 | grep lstat 0.38 0.000032 5 7 3 lstat nipunn@nipunn-dbx:~/src/server3$ strace -f -c ../git/bin-wrappers/git diff HEAD 2>&1 | grep lstat 99.44 0.741892 9 81634 10 lstat On mac (2.29.2 vs w/ this patch): nipunn-mbp:server nipunn$ sudo dtruss -L -f -c git diff 2>&1 | grep "^lstat64 " lstat64 8 nipunn-mbp:server nipunn$ sudo dtruss -L -f -c git diff HEAD 2>&1 | grep "^lstat64 " lstat64 120242 nipunn-mbp:server nipunn$ sudo dtruss -L -f -c ../git/bin-wrappers/git diff 2>&1 | grep "^lstat64 " lstat64 4 nipunn-mbp:server nipunn$ sudo dtruss -L -f -c ../git/bin-wrappers/git diff HEAD 2>&1 | grep "^lstat64 " lstat64 4497 There are still a bunch of lstats - on directories, but not every file. Progress! Signed-off-by: Nipunn Koorapati <nipunn@dropbox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
			
				
	
	
		
			289 lines
		
	
	
		
			7.4 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
			
		
		
	
	
			289 lines
		
	
	
		
			7.4 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
#!/bin/sh
 | 
						|
 | 
						|
test_description="Test core.fsmonitor"
 | 
						|
 | 
						|
. ./perf-lib.sh
 | 
						|
 | 
						|
#
 | 
						|
# Performance test for the fsmonitor feature which enables git to talk to a
 | 
						|
# file system change monitor and avoid having to scan the working directory
 | 
						|
# for new or modified files.
 | 
						|
#
 | 
						|
# By default, the performance test will utilize the Watchman file system
 | 
						|
# monitor if it is installed.  If Watchman is not installed, it will use a
 | 
						|
# dummy integration script that does not report any new or modified files.
 | 
						|
# The dummy script has very little overhead which provides optimistic results.
 | 
						|
#
 | 
						|
# The performance test will also use the untracked cache feature if it is
 | 
						|
# available as fsmonitor uses it to speed up scanning for untracked files.
 | 
						|
#
 | 
						|
# There are 3 environment variables that can be used to alter the default
 | 
						|
# behavior of the performance test:
 | 
						|
#
 | 
						|
# GIT_PERF_7519_UNTRACKED_CACHE: used to configure core.untrackedCache
 | 
						|
# GIT_PERF_7519_SPLIT_INDEX: used to configure core.splitIndex
 | 
						|
# GIT_PERF_7519_FSMONITOR: used to configure core.fsMonitor. May be an
 | 
						|
#   absolute path to an integration. May be a space delimited list of
 | 
						|
#   absolute paths to integrations.
 | 
						|
#
 | 
						|
# The big win for using fsmonitor is the elimination of the need to scan the
 | 
						|
# working directory looking for changed and untracked files. If the file
 | 
						|
# information is all cached in RAM, the benefits are reduced.
 | 
						|
#
 | 
						|
# GIT_PERF_7519_DROP_CACHE: if set, the OS caches are dropped between tests
 | 
						|
#
 | 
						|
# GIT_PERF_7519_TRACE: if set, enable trace logging during the test.
 | 
						|
#   Trace logs will be grouped by fsmonitor provider.
 | 
						|
 | 
						|
test_perf_large_repo
 | 
						|
test_checkout_worktree
 | 
						|
 | 
						|
test_lazy_prereq UNTRACKED_CACHE '
 | 
						|
	{ git update-index --test-untracked-cache; ret=$?; } &&
 | 
						|
	test $ret -ne 1
 | 
						|
'
 | 
						|
 | 
						|
test_lazy_prereq WATCHMAN '
 | 
						|
	command -v watchman
 | 
						|
'
 | 
						|
 | 
						|
if test_have_prereq WATCHMAN
 | 
						|
then
 | 
						|
	# Convert unix style paths to escaped Windows style paths for Watchman
 | 
						|
	case "$(uname -s)" in
 | 
						|
	MSYS_NT*)
 | 
						|
	  GIT_WORK_TREE="$(cygpath -aw "$PWD" | sed 's,\\,/,g')"
 | 
						|
	  ;;
 | 
						|
	*)
 | 
						|
	  GIT_WORK_TREE="$PWD"
 | 
						|
	  ;;
 | 
						|
	esac
 | 
						|
fi
 | 
						|
 | 
						|
if test -n "$GIT_PERF_7519_DROP_CACHE"
 | 
						|
then
 | 
						|
	# When using GIT_PERF_7519_DROP_CACHE, GIT_PERF_REPEAT_COUNT must be 1 to
 | 
						|
	# generate valid results. Otherwise the caching that happens for the nth
 | 
						|
	# run will negate the validity of the comparisons.
 | 
						|
	if test "$GIT_PERF_REPEAT_COUNT" -ne 1
 | 
						|
	then
 | 
						|
		echo "warning: Setting GIT_PERF_REPEAT_COUNT=1" >&2
 | 
						|
		GIT_PERF_REPEAT_COUNT=1
 | 
						|
	fi
 | 
						|
fi
 | 
						|
 | 
						|
trace_start() {
 | 
						|
	if test -n "$GIT_PERF_7519_TRACE"
 | 
						|
	then
 | 
						|
		name="$1"
 | 
						|
		TEST_TRACE_DIR="$TEST_OUTPUT_DIRECTORY/test-trace/p7519/"
 | 
						|
		echo "Writing trace logging to $TEST_TRACE_DIR"
 | 
						|
 | 
						|
		mkdir -p "$TEST_TRACE_DIR"
 | 
						|
 | 
						|
		# Start Trace2 logging and any other GIT_TRACE_* logs that you
 | 
						|
		# want for this named test case.
 | 
						|
 | 
						|
		GIT_TRACE2_PERF="$TEST_TRACE_DIR/$name.trace2perf"
 | 
						|
		export GIT_TRACE2_PERF
 | 
						|
 | 
						|
		>"$GIT_TRACE2_PERF"
 | 
						|
	fi
 | 
						|
}
 | 
						|
 | 
						|
trace_stop() {
 | 
						|
	if test -n "$GIT_PERF_7519_TRACE"
 | 
						|
	then
 | 
						|
		unset GIT_TRACE2_PERF
 | 
						|
	fi
 | 
						|
}
 | 
						|
 | 
						|
test_expect_success "one time repo setup" '
 | 
						|
	# set untrackedCache depending on the environment
 | 
						|
	if test -n "$GIT_PERF_7519_UNTRACKED_CACHE"
 | 
						|
	then
 | 
						|
		git config core.untrackedCache "$GIT_PERF_7519_UNTRACKED_CACHE"
 | 
						|
	else
 | 
						|
		if test_have_prereq UNTRACKED_CACHE
 | 
						|
		then
 | 
						|
			git config core.untrackedCache true
 | 
						|
		else
 | 
						|
			git config core.untrackedCache false
 | 
						|
		fi
 | 
						|
	fi &&
 | 
						|
 | 
						|
	# set core.splitindex depending on the environment
 | 
						|
	if test -n "$GIT_PERF_7519_SPLIT_INDEX"
 | 
						|
	then
 | 
						|
		git config core.splitIndex "$GIT_PERF_7519_SPLIT_INDEX"
 | 
						|
	fi &&
 | 
						|
 | 
						|
	mkdir 1_file 10_files 100_files 1000_files 10000_files &&
 | 
						|
	for i in $(test_seq 1 10); do touch 10_files/$i; done &&
 | 
						|
	for i in $(test_seq 1 100); do touch 100_files/$i; done &&
 | 
						|
	for i in $(test_seq 1 1000); do touch 1000_files/$i; done &&
 | 
						|
	for i in $(test_seq 1 10000); do touch 10000_files/$i; done &&
 | 
						|
	git add 1_file 10_files 100_files 1000_files 10000_files &&
 | 
						|
	git commit -qm "Add files" &&
 | 
						|
 | 
						|
	# If Watchman exists, watch the work tree and attempt a query.
 | 
						|
	if test_have_prereq WATCHMAN; then
 | 
						|
		watchman watch "$GIT_WORK_TREE" &&
 | 
						|
		watchman watch-list | grep -q -F "p7519-fsmonitor"
 | 
						|
	fi
 | 
						|
'
 | 
						|
 | 
						|
setup_for_fsmonitor() {
 | 
						|
	# set INTEGRATION_SCRIPT depending on the environment
 | 
						|
	if test -n "$INTEGRATION_PATH"
 | 
						|
	then
 | 
						|
		INTEGRATION_SCRIPT="$INTEGRATION_PATH"
 | 
						|
	else
 | 
						|
		#
 | 
						|
		# Choose integration script based on existence of Watchman.
 | 
						|
		# Fall back to an empty integration script.
 | 
						|
		#
 | 
						|
		mkdir .git/hooks &&
 | 
						|
		if test_have_prereq WATCHMAN
 | 
						|
		then
 | 
						|
			INTEGRATION_SCRIPT=".git/hooks/fsmonitor-watchman" &&
 | 
						|
			cp "$TEST_DIRECTORY/../templates/hooks--fsmonitor-watchman.sample" "$INTEGRATION_SCRIPT"
 | 
						|
		else
 | 
						|
			INTEGRATION_SCRIPT=".git/hooks/fsmonitor-empty" &&
 | 
						|
			write_script "$INTEGRATION_SCRIPT"<<-\EOF
 | 
						|
			EOF
 | 
						|
		fi
 | 
						|
	fi &&
 | 
						|
 | 
						|
	git config core.fsmonitor "$INTEGRATION_SCRIPT" &&
 | 
						|
	git update-index --fsmonitor 2>error &&
 | 
						|
	if test_have_prereq WATCHMAN
 | 
						|
	then
 | 
						|
		test_must_be_empty error  # ensure no silent error
 | 
						|
	else
 | 
						|
		grep "Empty last update token" error
 | 
						|
	fi
 | 
						|
}
 | 
						|
 | 
						|
test_perf_w_drop_caches () {
 | 
						|
	if test -n "$GIT_PERF_7519_DROP_CACHE"; then
 | 
						|
		test-tool drop-caches
 | 
						|
	fi
 | 
						|
 | 
						|
	test_perf "$@"
 | 
						|
}
 | 
						|
 | 
						|
test_fsmonitor_suite() {
 | 
						|
	if test -n "$INTEGRATION_SCRIPT"; then
 | 
						|
		DESC="fsmonitor=$(basename $INTEGRATION_SCRIPT)"
 | 
						|
	else
 | 
						|
		DESC="fsmonitor=disabled"
 | 
						|
	fi
 | 
						|
 | 
						|
	test_expect_success "test_initialization" '
 | 
						|
		git reset --hard &&
 | 
						|
		git status  # Warm caches
 | 
						|
	'
 | 
						|
 | 
						|
	test_perf_w_drop_caches "status ($DESC)" '
 | 
						|
		git status
 | 
						|
	'
 | 
						|
 | 
						|
	test_perf_w_drop_caches "status -uno ($DESC)" '
 | 
						|
		git status -uno
 | 
						|
	'
 | 
						|
 | 
						|
	test_perf_w_drop_caches "status -uall ($DESC)" '
 | 
						|
		git status -uall
 | 
						|
	'
 | 
						|
 | 
						|
	# Update the mtimes on upto 100k files to make status think
 | 
						|
	# that they are dirty.  For simplicity, omit any files with
 | 
						|
	# LFs (i.e. anything that ls-files thinks it needs to dquote).
 | 
						|
	# Then fully backslash-quote the paths to capture any
 | 
						|
	# whitespace so that they pass thru xargs properly.
 | 
						|
	#
 | 
						|
	test_perf_w_drop_caches "status (dirty) ($DESC)" '
 | 
						|
		git ls-files | \
 | 
						|
			head -100000 | \
 | 
						|
			grep -v \" | \
 | 
						|
			sed '\''s/\(.\)/\\\1/g'\'' | \
 | 
						|
			xargs test-tool chmtime -300 &&
 | 
						|
		git status
 | 
						|
	'
 | 
						|
 | 
						|
	test_perf_w_drop_caches "diff ($DESC)" '
 | 
						|
		git diff
 | 
						|
	'
 | 
						|
 | 
						|
	test_perf_w_drop_caches "diff HEAD ($DESC)" '
 | 
						|
		git diff HEAD
 | 
						|
	'
 | 
						|
 | 
						|
	test_perf_w_drop_caches "diff -- 0_files ($DESC)" '
 | 
						|
		git diff -- 1_file
 | 
						|
	'
 | 
						|
 | 
						|
	test_perf_w_drop_caches "diff -- 10_files ($DESC)" '
 | 
						|
		git diff -- 10_files
 | 
						|
	'
 | 
						|
 | 
						|
	test_perf_w_drop_caches "diff -- 100_files ($DESC)" '
 | 
						|
		git diff -- 100_files
 | 
						|
	'
 | 
						|
 | 
						|
	test_perf_w_drop_caches "diff -- 1000_files ($DESC)" '
 | 
						|
		git diff -- 1000_files
 | 
						|
	'
 | 
						|
 | 
						|
	test_perf_w_drop_caches "diff -- 10000_files ($DESC)" '
 | 
						|
		git diff -- 10000_files
 | 
						|
	'
 | 
						|
 | 
						|
	test_perf_w_drop_caches "add ($DESC)" '
 | 
						|
		git add  --all
 | 
						|
	'
 | 
						|
}
 | 
						|
 | 
						|
#
 | 
						|
# Run a full set of perf tests using each Hook-based fsmonitor provider,
 | 
						|
# such as Watchman.
 | 
						|
#
 | 
						|
 | 
						|
trace_start fsmonitor-watchman
 | 
						|
if test -n "$GIT_PERF_7519_FSMONITOR"; then
 | 
						|
	for INTEGRATION_PATH in $GIT_PERF_7519_FSMONITOR; do
 | 
						|
		test_expect_success "setup for fsmonitor $INTEGRATION_PATH" 'setup_for_fsmonitor'
 | 
						|
		test_fsmonitor_suite
 | 
						|
	done
 | 
						|
else
 | 
						|
	test_expect_success "setup for fsmonitor" 'setup_for_fsmonitor'
 | 
						|
	test_fsmonitor_suite
 | 
						|
fi
 | 
						|
 | 
						|
if test_have_prereq WATCHMAN
 | 
						|
then
 | 
						|
	watchman watch-del "$GIT_WORK_TREE" >/dev/null 2>&1 &&
 | 
						|
 | 
						|
	# Work around Watchman bug on Windows where it holds on to handles
 | 
						|
	# preventing the removal of the trash directory
 | 
						|
	watchman shutdown-server >/dev/null 2>&1
 | 
						|
fi
 | 
						|
trace_stop
 | 
						|
 | 
						|
#
 | 
						|
# Run a full set of perf tests with the fsmonitor feature disabled.
 | 
						|
#
 | 
						|
 | 
						|
trace_start fsmonitor-disabled
 | 
						|
test_expect_success "setup without fsmonitor" '
 | 
						|
	unset INTEGRATION_SCRIPT &&
 | 
						|
	git config --unset core.fsmonitor &&
 | 
						|
	git update-index --no-fsmonitor
 | 
						|
'
 | 
						|
 | 
						|
test_fsmonitor_suite
 | 
						|
trace_stop
 | 
						|
 | 
						|
test_done
 |