diff --git a/scan.pl b/scan.pl index ce93745..1fcf872 100755 --- a/scan.pl +++ b/scan.pl @@ -545,6 +545,7 @@ sub mann_kendall_sens_slope { my %unit2dec = ( 'CPU%' => 3, 'nanoseconds' => 2, + 'seconds' => 3, ); sub show { @@ -912,11 +913,13 @@ sub single { elsif(/^confopts: (.*)/) { push @confopts, $1; } - elsif(/^(.*) configure non-debug/) { + elsif(/^(.?*) (\d+|) *configure non-debug/) { $buildstart = $1; + $buildstartns = $2; } - elsif(/^(.*) make -C tests/) { + elsif(/^(.?*) (\d+|) *make -C tests/) { $builddone = $1; + $builddonens = $2; } elsif(/^structs: (.*)\t(\d+)\t\d*/) { my ($struct, $size) = ($1,$2); @@ -1020,9 +1023,11 @@ sub single { } if($buildstart && $builddone) { - # get the build time + # get the build time in seconds $buildtime{$scan} = `date +%s -d "$builddone"` - `date +%s -d "$buildstart"`; + # then adjust with the nanoseconds, when available: + $buildtime{$scan} += ($builddonens - $buildstartns) / 1000000000; } } diff --git a/single.sh b/single.sh index 2cc586c..9a8607f 100755 --- a/single.sh +++ b/single.sh @@ -45,7 +45,7 @@ pahole lib/.libs/libcurl.a -C Curl_easy,Curl_multi,connectdata -s | sed 's/^/str date "$PREF make clean again" make clean >makeclean.log 2>&1 -date "$PREF configure non-debug" +date "$PREF %N configure non-debug" RELOPTS="--enable-unity --disable-shared --enable-ipv6 --with-gssapi --enable-werror --with-nghttp2 --with-openssl --with-ngtcp2 --with-nghttp3 --with-libssh2 --with-test-caddy=$HOME/caddy/caddy_linux_amd64 --enable-ssls-export --enable-httpsrr --with-test-nghttpx=$HOME/build-nghttp2/bin/nghttpx --with-backtrace --enable-ntlm --enable-smb --enable-proxy-http3 --enable-httpsig" ./configure $RELOPTS >>configure.log 2>&1 @@ -54,7 +54,7 @@ echo "confopts: $RELOPTS"; date "$PREF make non-debug" make V=1 -sj20 >>make.log 2>&1 -date "$PREF make -C tests" +date "$PREF %N make -C tests" make -C tests -sj20 >maketests.log 2>&1 date "$PREF curl -V"