Skip to content

VirtualMachine: make receive timeout configurable #1449

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

Merged
slipher merged 1 commit into from
Dec 13, 2024
Merged

VirtualMachine: make receive timeout configurable #1449

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
10 changes: 8 additions & 2 deletions src/engine/framework/VirtualMachine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,11 @@ static Cvar::Cvar<bool> vm_nacl_bootstrap(
"Use NaCl bootstrap helper",
Cvar::INIT, true);

static Cvar::Cvar<int> vm_timeout(
"vm.timeout",
"Receive timeout in seconds",
Cvar::NONE, 2);

namespace VM {

// https://github.com/Unvanquished/Unvanquished/issues/944#issuecomment-744454772
Expand Down Expand Up @@ -502,8 +507,9 @@ void VMBase::Create()

// Only set a receive timeout for non-debug configurations, otherwise it
// would get triggered by breakpoints.
if (type != TYPE_NATIVE_DLL && !params.debug.Get())
rootChannel.SetRecvTimeout(std::chrono::seconds(2));
if (type != TYPE_NATIVE_DLL && !params.debug.Get()) {
rootChannel.SetRecvTimeout(std::chrono::seconds(vm_timeout.Get()));
}

// Read the ABI version detection ABI version from the root socket.
// If this fails, we assume the remote process failed to start
Expand Down
Loading