Merge pull request #520 from mstange/update-deps-20240307

Update dependencies

Author: mstange

Cargo.lock

@@ -18,7 +18,7 @@ rustc-hash = "2"
 memoffset = "0.9"
 
 [dependencies.windows]
-version = "0.59"
+version = "0.60"
 features =  ["Win32_System_Diagnostics_Etw",
              "Win32_System_Diagnostics_Debug",
              "Win32_System_SystemInformation",

etw-reader/Cargo.toml

@@ -10,7 +10,7 @@ repository = "https://github.com/mstange/samply/"
 readme = "README.md"
 
 [dependencies]
-bytesize = "1.3.0"
+bytesize = "2"
 log = "0.4.21"
 tokio = { version = "1.39", features = [
   "fs",

samply-quota-manager/Cargo.toml

@@ -55,7 +55,7 @@ yoke-derive = "0.8"
 nom = "7.1.1"
 zerocopy = "0.8"
 zerocopy-derive = "0.8"
-linux-perf-data = "0.10.0"
+linux-perf-data = "0.11"
 
 [dev-dependencies]
 memmap2 = "0.9.4"

samply-symbols/Cargo.toml

@@ -15,7 +15,7 @@ fxprof-processed-profile = { version = "0.8", path = "../fxprof-processed-profil
 # framehop = { path = "../../framehop" }
 framehop = "0.13"
 # linux-perf-data = { path = "../../linux-perf-data" }
-linux-perf-data = "0.10.1"
+linux-perf-data = "0.11"
 
 tokio = { version = "1.39", features = ["rt", "rt-multi-thread", "macros"] }
 tokio-util = "0.7.11"
@@ -48,7 +48,7 @@ ctrlc = "3.4.4"
 log = "0.4.21"
 env_logger = "0.11"
 cfg-if = "1.0.0"
-fs4 = "0.12"
+fs4 = "0.13"
 humantime = "2.1.0"
 shlex = "1.3.0"
 samply-quota-manager = { version = "0.1.0", path = "../samply-quota-manager" }
@@ -85,10 +85,9 @@ which = "7.0.0"
 winver = "1"
 
 # etw-reader = { path = "../etw-reader" }
-# linux-perf-data = "0.10.1"
 
 [target.'cfg(windows)'.dependencies.windows]
-version = "0.59"
+version = "0.60"
 features =  ["Win32",
              "Win32_Foundation",
              "Win32_Security",

samply/Cargo.toml

@@ -25,7 +25,6 @@ use std::marker::PhantomData;
 use std::path::Path;
 
 use fs4::fs_std::FileExt;
-use fs4::lock_contended_error;
 use serde::de::DeserializeOwned;
 use serde::ser::Serialize;
 
@@ -111,15 +110,15 @@ impl<T: DeserializeOwned> Receiver<T> {
         // Poll until self.current_lock is locked by the other side.
         loop {
             match self.current_lock.try_lock_exclusive() {
-                Ok(()) => {
+                Ok(true) => {
                     // Not locked yet.
                     FileExt::unlock(&self.current_lock).unwrap();
                 }
-                Err(e) if e.kind() == std::io::ErrorKind::Interrupted => {}
-                Err(e) if e.raw_os_error() == lock_contended_error().raw_os_error() => {
+                Ok(false) => {
                     // Success! The helper process now owns the file lock of self.current_lock.
                     break;
                 }
+                Err(e) if e.kind() == std::io::ErrorKind::Interrupted => {}
                 Err(e) => return Err(e),
             }
             std::thread::sleep(std::time::Duration::from_millis(50));

samply/src/windows/utility_process/file_channel.rs

@@ -22,8 +22,8 @@ samply-api = { version = "0.24.0", path = "../samply-api", features = ["send_fut
 samply-symbols = { version = "0.24.0", path = "../samply-symbols", features = ["send_futures"] }
 # symsrv = { path = "../../symsrv" }
 symsrv = "0.5.2"
-yoke = "0.7"
-yoke-derive = "0.7"
+yoke = "0.8"
+yoke-derive = "0.8"
 libc = "0.2"
 uuid = "1"
 reqwest = { version = "0.12", default-features = false, features = [
@@ -37,7 +37,7 @@ bytes = "1.10"
 memmap2 = "0.9.4"
 tokio = { version = "1.38", features = ["fs"] }
 futures-util = "0.3.30"
-fs4 = "0.12"
+fs4 = "0.13"
 thiserror = "2"
 async-compression = { version = "0.4", default-features = false, features = [
     "tokio",

wholesym/Cargo.toml

@@ -2,7 +2,6 @@ use std::io;
 use std::path::Path;
 
 use fs4::fs_std::FileExt;
-use fs4::lock_contended_error;
 
 /// The error type for the `create_file_cleanly` function.
 #[derive(thiserror::Error, Debug)]
@@ -189,11 +188,9 @@ async fn lock_file_exclusive(file: std::fs::File) -> Result<std::fs::File, io::E
     // We have a retry loop here because file locking can be interrupted by signals.
     for _ in 0..5 {
         match file.try_lock_exclusive() {
-            Ok(()) => return Ok(file),
+            Ok(true) => return Ok(file),
+            Ok(false) => return lock_file_exclusive_with_blocking_thread(file).await,
             Err(e) if e.kind() == io::ErrorKind::Interrupted => continue,
-            Err(e) if e.raw_os_error() == lock_contended_error().raw_os_error() => {
-                return lock_file_exclusive_with_blocking_thread(file).await
-            }
             Err(e) => return Err(e),
         }
     }