From c2545d6e2f8248b20d2acddb2d989e482251ca65 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Mon, 13 Aug 2018 10:55:39 -0500 Subject: [PATCH 1/4] Log memory and file system access --- bench | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bench b/bench index 394eac7..2f349cf 100755 --- a/bench +++ b/bench @@ -17,7 +17,7 @@ bundle update NUMBER_OF_RUNS=3 RESULTS="$(pwd)/results.csv" if [[ ! -s $RESULTS ]]; then - echo "Jekyll version, user time in seconds, site" > $RESULTS + echo "Jekyll version, user time in seconds, site, Maximum memory, Number of file writes, Number of file reads" > $RESULTS fi if [[ -n $PR ]]; then @@ -65,7 +65,7 @@ for SITE in $(cat "site-list"); do git clone --recurse-submodules -q "$SITE" "$SOURCE" fi for ((i=0; i Date: Mon, 13 Aug 2018 12:50:22 -0500 Subject: [PATCH 2/4] Display max memory used for a build --- report | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/report b/report index f0c163e..a5236b4 100755 --- a/report +++ b/report @@ -52,25 +52,26 @@ end puts markdown_header if ENV.key?("REF") && ENV.key?("PR") -puts "| ref | build time in seconds |" -puts "|:-----------------------------------------|----------------------:|" +puts "| ref | build time in seconds | max memory |" +puts "|:-----------------------------------------|----------------------:|-----------:|" summed_results = {} site_results = {} results.each do |row| - summed_results[row[0]] = 0.0 unless summed_results.key?(row[0]) + summed_results[row[0]] = [0.0,0] unless summed_results.key?(row[0]) site_results[row[2]] ||= { :flamegraph => linkify_flamegraph(row[2]), :site => linkify_site(row[2]), :time => 0.0, } - summed_results[row[0]] += row[1] + summed_results[row[0]][0] += row[1] + summed_results[row[0]][1] = row[3] if row[3] > summed_results[row[0]][1] site_results[row[2]][:time] += row[1] if row[0] == "##{ENV["PR"]}" end -summed_results.each do |ref, time| +summed_results.each do |ref, data| ref = "`#{ref}`" unless ref =~ %r!\A(?:[0-9a-f]+|#\d+)\Z! - puts format("| %-40s | %21.2f |", ref, time) + puts format("| %-40s | %21.2f | %10d |", ref, data[0], data[1]) end if ENV.key?("REF") && ENV.key?("PR") From 0e3c4b8475b6317bf30b3cc35cdae75c76a15749 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Mon, 13 Aug 2018 13:05:59 -0500 Subject: [PATCH 3/4] Code cleanup --- report | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/report b/report index a5236b4..f1635ca 100755 --- a/report +++ b/report @@ -58,20 +58,25 @@ puts "|:-----------------------------------------|----------------------:|------ summed_results = {} site_results = {} results.each do |row| - summed_results[row[0]] = [0.0,0] unless summed_results.key?(row[0]) - site_results[row[2]] ||= { - :flamegraph => linkify_flamegraph(row[2]), - :site => linkify_site(row[2]), + ref = row[0] + site = row[2] + site_results[site] ||= { + :flamegraph => linkify_flamegraph(site), + :site => linkify_site(site), :time => 0.0, } - summed_results[row[0]][0] += row[1] - summed_results[row[0]][1] = row[3] if row[3] > summed_results[row[0]][1] - site_results[row[2]][:time] += row[1] if row[0] == "##{ENV["PR"]}" + summed_results[ref] ||= { + :ref => (ref =~ %r!\A(?:[0-9a-f]+|#\d+)\Z!) ? ref : "`#{ref}`", + :time => 0.0, + :max_mem => 0 + } + site_results[site][:time ] += row[1] if ref[0] == "##{ENV["PR"]}" + summed_results[ref][:time] += row[1] + summed_results[ref][:max_mem] = row[3] if row[3] > summed_results[ref][:max_mem] end summed_results.each do |ref, data| - ref = "`#{ref}`" unless ref =~ %r!\A(?:[0-9a-f]+|#\d+)\Z! - puts format("| %-40s | %21.2f | %10d |", ref, data[0], data[1]) + puts format("| %-40s | %