Merge pull request #1937 from rdbtCVS/fix/android-helper-scheduling
🤖 Agent: Thanks rdbt! Android-only cfg change to helper thread priorities; the desktop targets compile the same code as before. Tested together with the other wave 1 contributor PRs on current main: fmt, clippy -D warnings and the horizon-client tests (1,120 lib tests and the rest) pass; the 114 harnesses the batch affects pass; lan_e2e anvil, grindstone, replant, instant_digging, digging, frames and leads pass with the host in-frame and on its server thread.
This commit is contained in:
@@ -6,7 +6,7 @@ license.workspace = true
|
||||
rust-version = "1.85"
|
||||
description = "Scheduling hints for the game's threads: the OS calls the crates that forbid unsafe code can't make"
|
||||
|
||||
[target.'cfg(any(target_vendor = "apple", target_os = "linux"))'.dependencies]
|
||||
[target.'cfg(any(target_vendor = "apple", target_os = "linux", target_os = "android"))'.dependencies]
|
||||
libc = "0.2"
|
||||
|
||||
[target.'cfg(windows)'.dependencies]
|
||||
|
||||
@@ -45,8 +45,8 @@ fn favour() -> bool {
|
||||
/// behind the server thread and the render thread (`behind_server`).
|
||||
static HELPERS_BEHIND: AtomicBool = AtomicBool::new(false);
|
||||
|
||||
/// How many nice levels a helper thread goes below the process on Linux.
|
||||
#[cfg(target_os = "linux")]
|
||||
/// How many nice levels a helper thread goes below the process on Linux and Android.
|
||||
#[cfg(any(target_os = "linux", target_os = "android"))]
|
||||
const BEHIND: i32 = 10;
|
||||
|
||||
/// From now on, the helper threads that call `behind_server` as they start
|
||||
@@ -58,7 +58,7 @@ pub fn put_helpers_behind() {
|
||||
|
||||
/// Called by a helper thread as it starts (world generation, lighting and
|
||||
/// meshing, a connection's packet writer): work no tick or frame waits for.
|
||||
/// Once `put_helpers_behind` was called, on Linux, where the server and
|
||||
/// Once `put_helpers_behind` was called, on Linux and Android, where the server and
|
||||
/// render threads can't be raised (`favour_current`), the helper lowers
|
||||
/// itself instead, which an unprivileged thread may: 10 nice levels below
|
||||
/// the process, or, where nice runs out (a game started under nice 10 or
|
||||
@@ -69,10 +69,10 @@ pub fn behind_server() -> bool {
|
||||
HELPERS_BEHIND.load(Ordering::Relaxed) && behind()
|
||||
}
|
||||
|
||||
#[cfg(target_os = "linux")]
|
||||
#[cfg(any(target_os = "linux", target_os = "android"))]
|
||||
fn behind() -> bool {
|
||||
// SAFETY: these read and set the calling thread's own nice value or
|
||||
// policy (who 0, pid 0 is the calling thread on Linux); `param` lives
|
||||
// policy (who 0, pid 0 is the calling thread on Linux and Android); `param` lives
|
||||
// across the call.
|
||||
unsafe {
|
||||
let nice = libc::getpriority(libc::PRIO_PROCESS as _, 0);
|
||||
@@ -85,7 +85,7 @@ fn behind() -> bool {
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(not(target_os = "linux"))]
|
||||
#[cfg(not(any(target_os = "linux", target_os = "android")))]
|
||||
fn behind() -> bool {
|
||||
false
|
||||
}
|
||||
@@ -117,12 +117,12 @@ mod tests {
|
||||
}
|
||||
|
||||
/// A helper goes behind only once a dedicated server asks for it, and
|
||||
/// then, on Linux, 10 nice levels below the process or in the idle class.
|
||||
/// then, on Linux and Android, 10 nice levels below the process or in the idle class.
|
||||
#[test]
|
||||
fn helpers_go_behind_only_when_asked() {
|
||||
assert!(!std::thread::spawn(super::behind_server).join().unwrap());
|
||||
super::put_helpers_behind();
|
||||
#[cfg(target_os = "linux")]
|
||||
#[cfg(any(target_os = "linux", target_os = "android"))]
|
||||
std::thread::spawn(|| {
|
||||
// SAFETY: reads the calling thread's own nice value.
|
||||
let before = unsafe { libc::getpriority(libc::PRIO_PROCESS as _, 0) };
|
||||
@@ -142,7 +142,7 @@ mod tests {
|
||||
})
|
||||
.join()
|
||||
.unwrap();
|
||||
#[cfg(not(target_os = "linux"))]
|
||||
#[cfg(not(any(target_os = "linux", target_os = "android")))]
|
||||
assert!(!std::thread::spawn(super::behind_server).join().unwrap());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user