Skip to content

Commit

Permalink
Merge #3575
Browse files Browse the repository at this point in the history
3575: chore: update jemalloc to 5.3.0 r=zhangsoledad a=zhangsoledad

<!--
Thank you for contributing to nervosnetwork/ckb!

If you haven't already, please read [CONTRIBUTING](https://github.com/nervosnetwork/ckb/blob/develop/CONTRIBUTING.md) document.

If you're unsure about anything, just ask; somebody should be along to answer within a day or two.

PR Title Format:
1. module [, module2, module3]: what's changed
2. *: what's changed
-->

### What is changed and how it works?

> ## 0.5.0 - 2022-05-19
> Update jemalloc to 5.3.0 (tikv/jemallocator#23)


### Related changes

- PR to update `owner/repo`:
- Need to cherry-pick to the release branch

### Check List <!--REMOVE the items that are not applicable-->

Tests <!-- At least one of them must be included. -->

- Unit test
- Integration test


### Release note <!-- Choose from None, Title Only and Note. Bugfixes or new features need a release note. -->

```release-note
Title Only: Include only the PR title in the release note.
```



Co-authored-by: zhangsoledad <787953403@qq.com>
  • Loading branch information
bors[bot] and zhangsoledad committed Sep 28, 2022
2 parents 2aa9c2b + 7a9d6db commit ffcd9d0
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Expand Up @@ -102,7 +102,7 @@ lto = true
codegen-units = 1

[target.'cfg(all(not(target_env = "msvc"), not(target_os="macos")))'.dependencies]
tikv-jemallocator = { version = "0.4.0", features = ["unprefixed_malloc_on_supported_platforms"] }
tikv-jemallocator = { version = "0.5.0", features = ["unprefixed_malloc_on_supported_platforms"] }

[features]
default = []
Expand Down
4 changes: 2 additions & 2 deletions util/memory-tracker/Cargo.toml
Expand Up @@ -14,8 +14,8 @@ ckb-metrics = { path = "../metrics", version = "= 0.105.0-pre" }
ckb-db = { path = "../../db", version = "= 0.105.0-pre" }

[target.'cfg(all(not(target_env = "msvc"), not(target_os="macos")))'.dependencies]
jemalloc-ctl = { package = "tikv-jemalloc-ctl", version = "0.4.2" }
jemalloc-sys = { package = "tikv-jemalloc-sys", version = "0.4.2" }
jemalloc-ctl = { package = "tikv-jemalloc-ctl", version = "0.5.0" }
jemalloc-sys = { package = "tikv-jemalloc-sys", version = "0.5.0" }
libc = "0.2"
once_cell = "1.8.0"

Expand Down

0 comments on commit ffcd9d0

Please sign in to comment.