diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7435f42..b5c8b72 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,11 +4,11 @@ on: pull_request: branches: - 'master' - - 'tikv-main' + - 'main' push: branches: - 'master' - - 'tikv-main' + - 'main' jobs: test: diff --git a/CHANGELOG.md b/CHANGELOG.md index d2ac9a6..427f9d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 0.5.0 - 2022-05-19 + +- Update jemalloc to 5.3.0 (#23) + # 0.4.3 - 2022-02-21 - Added riscv64 support (#14) diff --git a/README.md b/README.md index 3866bf5..6276212 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ This project is the successor of [jemallocator](https://github.com/gnzlbg/jemallocator). -The project is published as `tikv-jemallocator` and `jemallocator` for historical reasons. The two crates are the same except names. It's OK to use either crate. For new projects, `jemallocator` should be used. +The project is published as `tikv-jemallocator` and `jemallocator` for historical reasons. The two crates are the same except names. It's OK to use either crate. But due to lack of permissions, only `jemallocator` and `jemalloc-sys` are updated. If you want to use other crates, `tikv-xxx` versions are still required. > Links against `jemalloc` and provides a `Jemalloc` unit type that implements > the allocator APIs and can be set as the `#[global_allocator]` @@ -30,7 +30,7 @@ To use `jemallocator` add it as a dependency: [dependencies] [target.'cfg(not(target_env = "msvc"))'.dependencies] -jemallocator = "0.4.3" +jemallocator = "0.5" ``` To set `jemallocator::Jemalloc` as the global allocator add this to your project: diff --git a/jemalloc-ctl/Cargo.toml b/jemalloc-ctl/Cargo.toml index dfd5b27..df4f74a 100644 --- a/jemalloc-ctl/Cargo.toml +++ b/jemalloc-ctl/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "jemalloc-ctl" -version = "0.4.3" +version = "0.5.0" authors = [ "Steven Fackler ", "Gonzalo Brito Gadeschi ", @@ -26,12 +26,12 @@ is-it-maintained-open-issues = { repository = "tikv/jemallocator" } maintenance = { status = "actively-developed" } [dependencies] -jemalloc-sys = { path = "../jemalloc-sys", version = "0.4.0" } +jemalloc-sys = { path = "../jemalloc-sys", version = "0.5.0" } libc = { version = "0.2", default-features = false } paste = "1" [dev-dependencies] -jemallocator = { path = "../jemallocator", version = "0.4.0" } +jemallocator = { path = "../jemallocator", version = "0.5.0" } [features] default = [] diff --git a/jemalloc-sys/Cargo.toml b/jemalloc-sys/Cargo.toml index 7e70a5d..8ea7bec 100644 --- a/jemalloc-sys/Cargo.toml +++ b/jemalloc-sys/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "jemalloc-sys" -version = "0.4.3+5.3.0" +version = "0.5.0+5.3.0" authors = [ "Alex Crichton ", "Gonzalo Brito Gadeschi ", diff --git a/jemallocator-global/Cargo.toml b/jemallocator-global/Cargo.toml index 8d49ad0..34f878b 100644 --- a/jemallocator-global/Cargo.toml +++ b/jemallocator-global/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "jemallocator-global" # Make sure to update the version in the readme as well: -version = "0.4.3" +version = "0.5.0" authors = [ "Gonzalo Brito Gadeschi ", "The TiKV Project Developers", @@ -26,7 +26,7 @@ is-it-maintained-open-issues = { repository = "tikv/jemallocator" } maintenance = { status = "actively-developed" } [dependencies] -jemallocator = { version = "0.4.0", path = "../jemallocator", optional = true } +jemallocator = { version = "0.5.0", path = "../jemallocator", optional = true } cfg-if = "0.1" [features] @@ -38,7 +38,7 @@ force_global_jemalloc = [ "jemallocator" ] # for a particular target, white-list the target explicitly here: [target.'cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))'.dependencies] -jemallocator = { version = "0.4.0", path = "../jemallocator", optional = false } +jemallocator = { version = "0.5.0", path = "../jemallocator", optional = false } # FIXME: https://github.com/gnzlbg/jemallocator/issues/91 # [target.'cfg(target_os = "windows")'.dependencies] diff --git a/jemallocator-global/README.md b/jemallocator-global/README.md index 9b0b836..0bed0b2 100644 --- a/jemallocator-global/README.md +++ b/jemallocator-global/README.md @@ -11,7 +11,7 @@ Add it as a dependency: ```toml # Cargo.toml [dependencies] -jemallocator-global = "0.4.0" +jemallocator-global = "0.5.0" ``` and `jemalloc` will be used as the `#[global_allocator]` on targets that support diff --git a/jemallocator-global/src/lib.rs b/jemallocator-global/src/lib.rs index ad54741..36207ff 100644 --- a/jemallocator-global/src/lib.rs +++ b/jemallocator-global/src/lib.rs @@ -5,7 +5,7 @@ //! ```toml //! # Cargo.toml //! [dependencies] -//! jemallocator-global = "0.4.0" +//! jemallocator-global = "0.5.0" //! ``` //! //! and `jemalloc` will be used as the `#[global_allocator]` on targets that diff --git a/jemallocator/Cargo.toml b/jemallocator/Cargo.toml index e80a6d6..5f24798 100644 --- a/jemallocator/Cargo.toml +++ b/jemallocator/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "jemallocator" # Make sure to update the version in the README as well: -version = "0.4.3" +version = "0.5.0" authors = [ "Alex Crichton ", "Gonzalo Brito Gadeschi ", @@ -33,12 +33,12 @@ test = false bench = false [dependencies] -jemalloc-sys = { path = "../jemalloc-sys", version = "0.4.0", default-features = false } +jemalloc-sys = { path = "../jemalloc-sys", version = "0.5.0", default-features = false } libc = { version = "^0.2.8", default-features = false } [dev-dependencies] paste = "1" -jemalloc-ctl = { path = "../jemalloc-ctl", version = "0.4.0" } +jemalloc-ctl = { path = "../jemalloc-ctl", version = "0.5.0" } [features] default = ["background_threads_runtime_support"] diff --git a/jemallocator/tests/background_thread_enabled.rs b/jemallocator/tests/background_thread_enabled.rs index ba7aa1d..60805e7 100644 --- a/jemallocator/tests/background_thread_enabled.rs +++ b/jemallocator/tests/background_thread_enabled.rs @@ -28,5 +28,5 @@ pub static malloc_conf: Option<&'static libc::c_char> = Some(unsafe { #[test] fn background_threads_enabled() { // Background threads are unconditionally enabled at run-time by default. - assert_eq!(jemalloc_ctl::opt::background_thread::read().unwrap(), true); + assert!(jemalloc_ctl::opt::background_thread::read().unwrap()); }