diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 82bbc7ae92..58ea088d09 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,6 +1,14 @@ name: CI -on: [pull_request] +on: + pull_request: + branches: + - 'master' + - 'main' + push: + branches: + - 'master' + - 'main' jobs: test: diff --git a/CHANGELOG.md b/CHANGELOG.md index d2ac9a60e7..427f9d46fd 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 ed06ec7102..6a253db29c 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,9 @@ [![ci]][github actions] [![Latest Version]][crates.io] [![docs]][docs.rs] -This project is a simplified fork of [jemallocator](https://github.com/gnzlbg/jemallocator) focus on server. +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. 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]` @@ -28,7 +30,7 @@ To use `tikv-jemallocator` add it as a dependency: [dependencies] [target.'cfg(not(target_env = "msvc"))'.dependencies] -tikv-jemallocator = "0.4.3" +tikv-jemallocator = "0.5" ``` To set `tikv_jemallocator::Jemalloc` as the global allocator add this to your project: diff --git a/jemalloc-ctl/Cargo.toml b/jemalloc-ctl/Cargo.toml index 7123cb37f6..e837bfeae9 100644 --- a/jemalloc-ctl/Cargo.toml +++ b/jemalloc-ctl/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tikv-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] -tikv-jemalloc-sys = { path = "../jemalloc-sys", version = "0.4.0" } +tikv-jemalloc-sys = { path = "../jemalloc-sys", version = "0.5.0" } libc = { version = "0.2", default-features = false } paste = "1" [dev-dependencies] -tikv-jemallocator = { path = "../jemallocator", version = "0.4.0" } +tikv-jemallocator = { path = "../jemallocator", version = "0.5.0" } [features] default = [] diff --git a/jemalloc-sys/Cargo.toml b/jemalloc-sys/Cargo.toml index 050e8832f4..91b84fd015 100644 --- a/jemalloc-sys/Cargo.toml +++ b/jemalloc-sys/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tikv-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/jemalloc-sys/build.rs b/jemalloc-sys/build.rs index 00ce683699..b4c02664a3 100644 --- a/jemalloc-sys/build.rs +++ b/jemalloc-sys/build.rs @@ -136,7 +136,7 @@ fn main() { .to_str() .unwrap() .replace("C:\\", "/c/") - .replace("\\", "/"), + .replace('\\', "/"), ) .current_dir(&build_dir) .env("CC", compiler.path()) diff --git a/jemallocator-global/Cargo.toml b/jemallocator-global/Cargo.toml index 7d544b5180..31cfc95190 100644 --- a/jemallocator-global/Cargo.toml +++ b/jemallocator-global/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tikv-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] -tikv-jemallocator = { version = "0.4.0", path = "../jemallocator", optional = true } +tikv-jemallocator = { version = "0.5.0", path = "../jemallocator", optional = true } cfg-if = "0.1" [features] @@ -38,7 +38,7 @@ force_global_jemalloc = [ "tikv-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] -tikv-jemallocator = { version = "0.4.0", path = "../jemallocator", optional = false } +tikv-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 d6acd3efd9..51f7d06afc 100644 --- a/jemallocator-global/README.md +++ b/jemallocator-global/README.md @@ -11,7 +11,7 @@ Add it as a dependency: ```toml # Cargo.toml [dependencies] -tikv-jemallocator-global = "0.4.0" +tikv-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 740050de1a..4244044633 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 18eaa8da53..01e98379dc 100644 --- a/jemallocator/Cargo.toml +++ b/jemallocator/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tikv-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] -tikv-jemalloc-sys = { path = "../jemalloc-sys", version = "0.4.0", default-features = false } +tikv-jemalloc-sys = { path = "../jemalloc-sys", version = "0.5.0", default-features = false } libc = { version = "^0.2.8", default-features = false } [dev-dependencies] paste = "1" -tikv-jemalloc-ctl = { path = "../jemalloc-ctl", version = "0.4.0" } +tikv-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 2d278da2d0..76d286d6d7 100644 --- a/jemallocator/tests/background_thread_enabled.rs +++ b/jemallocator/tests/background_thread_enabled.rs @@ -28,8 +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!( - tikv_jemalloc_ctl::opt::background_thread::read().unwrap(), - true - ); + assert!(tikv_jemalloc_ctl::opt::background_thread::read().unwrap(),); }