From d9a25e9d5508ec11e944b65b14700c2d595096a9 Mon Sep 17 00:00:00 2001 From: Clement Rey Date: Mon, 14 Oct 2024 11:08:40 +0200 Subject: [PATCH 1/2] mimalloc 0.1.43+ --- Cargo.lock | 8 ++++---- Cargo.toml | 5 +---- crates/top/rerun-cli/Cargo.toml | 4 +--- examples/rust/custom_space_view/Cargo.toml | 2 +- examples/rust/extend_viewer_ui/Cargo.toml | 2 +- rerun_py/Cargo.toml | 4 +--- 6 files changed, 9 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 97b37f84cd78..fa8afef806b9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3292,9 +3292,9 @@ checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libmimalloc-sys" -version = "0.1.35" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" +checksum = "23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44" dependencies = [ "cc", "libc", @@ -3481,9 +3481,9 @@ dependencies = [ [[package]] name = "mimalloc" -version = "0.1.37" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98" +checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633" dependencies = [ "libmimalloc-sys", ] diff --git a/Cargo.toml b/Cargo.toml index 360ff061466b..d585cc098bd9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -198,10 +198,7 @@ log = "0.4" log-once = "0.4" lz4_flex = "0.11" memory-stats = "1.1" -# TODO(#5875): `mimalloc` starts leaking OS pages starting with `0.1.38`. -# This version is not pinned to avoid creating version requirement conflicts, -# but other packages pin it to exactly "=0.1.37" -mimalloc = "0.1.37" +mimalloc = "0.1.43" mime_guess2 = "2.0" # infer MIME type by file extension, and map mime to file extension mint = "0.5.9" re_mp4 = "0.1.0" diff --git a/crates/top/rerun-cli/Cargo.toml b/crates/top/rerun-cli/Cargo.toml index ce0c0f96bf98..9d8859f029f1 100644 --- a/crates/top/rerun-cli/Cargo.toml +++ b/crates/top/rerun-cli/Cargo.toml @@ -78,9 +78,7 @@ rerun = { workspace = true, features = [ ] } document-features.workspace = true -# TODO(#5875): `mimalloc` starts leaking OS pages starting with `0.1.38`. -# When the bug is fixed, change this back to `mimalloc.workspace = true`. -mimalloc = "=0.1.37" +mimalloc = "0.1.43" [build-dependencies] diff --git a/examples/rust/custom_space_view/Cargo.toml b/examples/rust/custom_space_view/Cargo.toml index 148412ddea10..999e2f408954 100644 --- a/examples/rust/custom_space_view/Cargo.toml +++ b/examples/rust/custom_space_view/Cargo.toml @@ -22,4 +22,4 @@ re_sdk_comms = { path = "../../../crates/store/re_sdk_comms", features = [ ] } # mimalloc is a much faster allocator: -mimalloc = "0.1" +mimalloc = "0.1.43" diff --git a/examples/rust/extend_viewer_ui/Cargo.toml b/examples/rust/extend_viewer_ui/Cargo.toml index 1d5f97c22ac7..f6ca4bd5af13 100644 --- a/examples/rust/extend_viewer_ui/Cargo.toml +++ b/examples/rust/extend_viewer_ui/Cargo.toml @@ -22,4 +22,4 @@ re_sdk_comms = { path = "../../../crates/store/re_sdk_comms", features = [ ] } # mimalloc is a much faster allocator: -mimalloc = "0.1" +mimalloc = "0.1.43" diff --git a/rerun_py/Cargo.toml b/rerun_py/Cargo.toml index 192c5f229b1e..30300c73ceb8 100644 --- a/rerun_py/Cargo.toml +++ b/rerun_py/Cargo.toml @@ -63,9 +63,7 @@ crossbeam.workspace = true document-features.workspace = true itertools.workspace = true infer.workspace = true -# TODO(#5875): `mimalloc` starts leaking OS pages starting with `0.1.38`. -# When the bug is fixed, change this back to `mimalloc = { workspace = true, …`. -mimalloc = { version = "=0.1.37", features = ["local_dynamic_tls"] } +mimalloc = { version = "0.1.43", features = ["local_dynamic_tls"] } numpy.workspace = true once_cell.workspace = true parking_lot.workspace = true From d8311619d70003948f799f7f5fdaf4d3ad477422 Mon Sep 17 00:00:00 2001 From: Clement Rey Date: Sat, 19 Oct 2024 18:12:14 +0200 Subject: [PATCH 2/2] fmt --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index d585cc098bd9..8a0a7dcb562d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -199,7 +199,7 @@ log-once = "0.4" lz4_flex = "0.11" memory-stats = "1.1" mimalloc = "0.1.43" -mime_guess2 = "2.0" # infer MIME type by file extension, and map mime to file extension +mime_guess2 = "2.0" # infer MIME type by file extension, and map mime to file extension mint = "0.5.9" re_mp4 = "0.1.0" natord = "1.0.9"