Skip to content

Use sudo --non-interactive in at_exit to not hang #514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alanwu-shopify-inc wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −4
Open

Use sudo --non-interactive in at_exit to not hang #514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/cpu_config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class IntelCPUConfig < CPUConfig
def disable_turbo_boost
# sudo requires the flag '-S' in order to take input from stdin
BenchmarkRunner.check_call("sudo -S sh -c 'echo #{TURBO_DISABLED_VALUE} > #{NO_TURBO_PATH}'")
at_exit { BenchmarkRunner.check_call("sudo -S sh -c 'echo 0 > #{NO_TURBO_PATH}'", quiet: true) }
at_exit { BenchmarkRunner.check_call("sudo --non-interactive sh -c 'echo 0 > #{NO_TURBO_PATH}'", quiet: true) }
end

def maximize_frequency
Expand Down Expand Up @@ -114,7 +114,7 @@ class AMDCPUConfig < CPUConfig
def disable_turbo_boost
# sudo requires the flag '-S' in order to take input from stdin
BenchmarkRunner.check_call("sudo -S sh -c 'echo #{TURBO_DISABLED_VALUE} > #{BOOST_PATH}'")
at_exit { BenchmarkRunner.check_call("sudo -S sh -c 'echo #{TURBO_ENABLED_VALUE} > #{BOOST_PATH}'", quiet: true) }
at_exit { BenchmarkRunner.check_call("sudo --non-interactive sh -c 'echo #{TURBO_ENABLED_VALUE} > #{BOOST_PATH}'", quiet: true) }
end

def maximize_frequency
Expand Down
4 changes: 2 additions & 2 deletions test/cpu_config_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
end

assert_equal 1, cleanup_commands.length, "at_exit block should call check_call once"
assert_equal "sudo -S sh -c 'echo 0 > /sys/devices/system/cpu/intel_pstate/no_turbo'", cleanup_commands[0][:cmd]
assert_equal "sudo --non-interactive sh -c 'echo 0 > /sys/devices/system/cpu/intel_pstate/no_turbo'", cleanup_commands[0][:cmd]
assert_equal({ quiet: true }, cleanup_commands[0][:opts])
end

Expand Down Expand Up @@ -298,7 +298,7 @@
end

assert_equal 1, cleanup_commands.length, "at_exit block should call check_call once"
assert_equal "sudo -S sh -c 'echo 1 > /sys/devices/system/cpu/cpufreq/boost'", cleanup_commands[0][:cmd]
assert_equal "sudo --non-interactive sh -c 'echo 1 > /sys/devices/system/cpu/cpufreq/boost'", cleanup_commands[0][:cmd]
assert_equal({ quiet: true }, cleanup_commands[0][:opts])
end

Expand Down
Loading