Switch to newer hwlocality to remove some unnecessary low-level dep…

…epdencies

Cargo.toml

@@ -90,6 +90,8 @@ inherits = "release"
 lto = "fat"
 
 [patch.crates-io]
+# TODO: Switch to release once v1.0.0-alpha.2 or newer is out
+hwlocality = { git = "https://github.com/HadrienG2/hwlocality", rev = "0f248573bcad584960fe20293c826203a265b833" }
 # TODO: Switch to stable release once https://github.com/paritytech/substrate-bip39/pull/20 is published
 substrate-bip39 = { git = "https://github.com/paritytech/substrate-bip39", rev = "03f02a7225d9bc5add92b7657790ee1ac8ab90a4" }
 

crates/subspace-farmer/Cargo.toml

@@ -62,12 +62,6 @@ tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 ulid = { version = "1.0.0", features = ["serde"] }
 zeroize = "1.7.0"
 
-[target.'cfg(not(windows))'.dependencies]
-libc = "0.2.152"
-
-[target.'cfg(windows)'.dependencies]
-windows-sys = "0.52.0"
-
 [features]
 default = ["numa"]
 numa = ["dep:hwlocality"]

crates/subspace-farmer/src/utils.rs

@@ -165,13 +165,9 @@ impl CpuCoreSet {
         if let Some(topology) = &self.topology {
             use hwlocality::cpu::binding::CpuBindingFlags;
             use hwlocality::cpu::cpuset::CpuSet;
+            use hwlocality::current_thread_id;
             use hwlocality::ffi::PositiveInt;
 
-            #[cfg(not(windows))]
-            let thread_id = unsafe { libc::pthread_self() };
-            #[cfg(windows)]
-            let thread_id = unsafe { windows_sys::Win32::System::Threading::GetCurrentThread() };
-
             // load the cpuset for the given core index.
             let cpu_cores = CpuSet::from_iter(
                 self.cores
@@ -180,7 +176,7 @@ impl CpuCoreSet {
             );
 
             if let Err(error) =
-                topology.bind_thread_cpu(thread_id, &cpu_cores, CpuBindingFlags::empty())
+                topology.bind_thread_cpu(current_thread_id(), &cpu_cores, CpuBindingFlags::empty())
             {
                 warn!(%error, ?cpu_cores, "Failed to pin thread to CPU cores")
             }