vanja/yabridge
1
0
Fork 0
mirror of https://github.com/robbert-vdh/yabridge.git synced 2026-05-09 20:29:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use a shorter delay for the first watchdog check

Browse Source
This commit is contained in:
Robbert van der Helm
2021-05-01 18:47:45 +02:00
parent 4ff538c7e1
commit 5c2da36ecd
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wine-host/utils.cpp
+8 -4
View File
@@ -80,7 +80,10 @@ MainContext::MainContext()
events_timer(context), events_timer(context),
watchdog_context(), watchdog_context(),
watchdog_timer(watchdog_context) { watchdog_timer(watchdog_context) {
async_handle_watchdog(); // To account for hosts terminating before the bridged plugin has
// initialized, we'll do the first watchdog check five seconds. After this
// we'll run the timer on a 30 second interval.
async_handle_watchdog_timer(5s);
watchdog_handler = Win32Thread([&]() { watchdog_handler = Win32Thread([&]() {
set_realtime_priority(false); set_realtime_priority(false);
@@ -142,10 +145,11 @@ MainContext::WatchdogGuard MainContext::register_watchdog(HostBridge& bridge) {
return WatchdogGuard(bridge, watched_bridges, watched_bridges_mutex); return WatchdogGuard(bridge, watched_bridges, watched_bridges_mutex);
} }
void MainContext::async_handle_watchdog() { void MainContext::async_handle_watchdog_timer(
std::chrono::steady_clock::duration interval) {
// Try to keep a steady framerate, but add in delays to let other events // Try to keep a steady framerate, but add in delays to let other events
// get handled if the GUI message handling somehow takes very long. // get handled if the GUI message handling somehow takes very long.
watchdog_timer.expires_at(std::chrono::steady_clock::now() + 20s); watchdog_timer.expires_at(std::chrono::steady_clock::now() + interval);
watchdog_timer.async_wait([&](const boost::system::error_code& error) { watchdog_timer.async_wait([&](const boost::system::error_code& error) {
if (error.failed()) { if (error.failed()) {
return; return;
@@ -160,6 +164,6 @@ void MainContext::async_handle_watchdog() {
bridge->shutdown_if_dangling(); bridge->shutdown_if_dangling();
} }
async_handle_watchdog(); async_handle_watchdog_timer(30s);
}); });
} }
src/wine-host/utils.h
+2 -1
View File
@@ -325,7 +325,8 @@ class MainContext {
* it's impossible to tell that the remote isn't alive anymore, and where * it's impossible to tell that the remote isn't alive anymore, and where
* `recv()` will just hang indefinitely. We use this watchdog to avoid this. * `recv()` will just hang indefinitely. We use this watchdog to avoid this.
*/ */
void async_handle_watchdog(); void async_handle_watchdog_timer(
std::chrono::steady_clock::duration interval);
/** /**
* The timer used to periodically handle X11 events and Win32 messages. * The timer used to periodically handle X11 events and Win32 messages.