@matheusbsbs / matheus-bagliano / commits / 0e67c32955

git p4 test: simplify timeout handling

'lib-git-p4.sh' uses timeouts in a watchdog process to kill a potentially stuck 'p4d' process and for certain cleanup operation between tests. It does so by first computing when the timeout should expire, and then repeatedly asking for the current time in seconds until it exceeds the expiration time, and for portability reasons it uses a one-liner Python script to ask for the current time. Replace these timeouts with downcounters, which, though not necessarily shorter, are much simpler, at least in the sense that they don't execute the Python interpreter every second. After this change the helper function with that Python one-liner has no callers left, remove it. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

SZEDER Gábor committed Mar 13, 2019 at 13:24 UTC 0e67c32955cee24c5ff534dd3f5f0de58ba91d02

1 file changed +6 -13

t/lib-git-p4.sh

+6 -13

@@ -44,15 +44,6 @@ native_path () {

44 echo "$path"

45 }

47 -# On Solaris the 'date +%s' function is not supported and therefore we

48 -# need this replacement.

49 -# Attention: This function is not safe again against time offset updates

50 -# at runtime (e.g. via NTP). The 'clock_gettime(CLOCK_MONOTONIC)'

51 -# function could fix that but it is not in Python until 3.3.

52 -time_in_seconds () {

53 - (cd / && "$PYTHON_PATH" -c 'import time; print(int(time.time()))')

54 -}

55 -

47 test_set_port P4DPORT

49 P4PORT=localhost:$P4DPORT

@@ -105,15 +96,16 @@ start_p4d () {

96 # will be caught with the "kill -0" check below.

97 i=${P4D_START_PATIENCE:-300}

108 - timeout=$(($(time_in_seconds) + $P4D_TIMEOUT))

99 + nr_tries_left=$P4D_TIMEOUT

100 while true

101 do

111 - if test $(time_in_seconds) -gt $timeout

102 + if test $nr_tries_left -eq 0

103 then

104 kill -9 $p4d_pid

105 exit 1

106 fi

107 sleep 1

108 + nr_tries_left=$(($nr_tries_left - 1))

109 done &

110 watchdog_pid=$!

111

@@ -167,10 +159,11 @@ p4_add_job () {

159 }

160

161 retry_until_success () {

170 - timeout=$(($(time_in_seconds) + $RETRY_TIMEOUT))

171 - until "$@" 2>/dev/null || test $(time_in_seconds) -gt $timeout

162 + nr_tries_left=$RETRY_TIMEOUT

163 + until "$@" 2>/dev/null || test $nr_tries_left -eq 0

164 do

165 sleep 1

166 + nr_tries_left=$(($nr_tries_left - 1))

167 done

168 }

169