Merge pull request #1201 from GuillaumeGomez/update-deps

Update dependencies and use PF_KTHREAD from libc

Cargo.toml

@@ -86,7 +86,7 @@ windows = { version = "0.52", features = [
 ]}
 
 [target.'cfg(not(any(target_os = "unknown", target_arch = "wasm32")))'.dependencies]
-libc = "^0.2.150"
+libc = "^0.2.153"
 
 [target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies]
 core-foundation-sys = "0.8"

src/unix/apple/system.rs

@@ -7,6 +7,7 @@ use crate::sys::utils::{get_sys_value, get_sys_value_by_name};
 
 use crate::{Cpu, CpuRefreshKind, LoadAvg, MemoryRefreshKind, Pid, Process, ProcessRefreshKind};
 
+#[cfg(all(target_os = "macos", not(feature = "apple-sandbox")))]
 use std::cell::UnsafeCell;
 use std::collections::HashMap;
 use std::ffi::CStr;
@@ -34,9 +35,12 @@ pub(crate) struct SystemInner {
     cpus: CpusWrapper,
 }
 
+#[cfg(all(target_os = "macos", not(feature = "apple-sandbox")))]
 pub(crate) struct Wrap<'a>(pub UnsafeCell<&'a mut HashMap<Pid, Process>>);
 
+#[cfg(all(target_os = "macos", not(feature = "apple-sandbox")))]
 unsafe impl<'a> Send for Wrap<'a> {}
+#[cfg(all(target_os = "macos", not(feature = "apple-sandbox")))]
 unsafe impl<'a> Sync for Wrap<'a> {}
 
 fn boot_time() -> u64 {

src/unix/linux/component.rs

@@ -155,6 +155,7 @@ enum TermalSensorType {
     IntelPECI,
     /// Not all types are supported by all chips so we keep space for
     /// unknown sensors.
+    #[allow(dead_code)]
     Unknown(u8),
 }
 

src/unix/linux/process.rs

@@ -88,9 +88,6 @@ enum ProcIndex {
     // More exist but we only use the listed ones. For more, take a look at `man proc`.
 }
 
-/* Not exposed yet. Defined at include/linux/sched.h */
-const PF_KTHREAD: c_ulong = 0x00200000;
-
 pub(crate) struct ProcessInner {
     pub(crate) name: String,
     pub(crate) cmd: Vec<String>,
@@ -461,7 +458,7 @@ fn retrieve_all_new_process_info(
 
     p.name = name.into();
     if c_ulong::from_str(parts[ProcIndex::Flags as usize])
-        .map(|flags| flags & PF_KTHREAD != 0)
+        .map(|flags| flags & libc::PF_KTHREAD as c_ulong != 0)
         .unwrap_or(false)
     {
         p.thread_kind = Some(ThreadKind::Kernel);