Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

parity-util-mem: use malloc for usable_size on android #355

Merged
merged 1 commit into from
Mar 12, 2020
Merged

parity-util-mem: use malloc for usable_size on android #355

merged 1 commit into from
Mar 12, 2020

Conversation

ordian
Copy link
Member

@ordian ordian commented Mar 12, 2020

Fixes #354.

@ordian ordian mentioned this pull request Mar 12, 2020
Closed
@tomaka
Copy link
Contributor

tomaka commented Mar 12, 2020

Seems to work!

@tomaka tomaka mentioned this pull request Mar 12, 2020
Closed
@ordian ordian marked this pull request as ready for review March 12, 2020 17:39
@ordian
Copy link
Member Author

ordian commented Mar 12, 2020

This PR needs 2 approvals for merge, also I'd like to merge #352 before releasing a new version.

@ordian ordian mentioned this pull request Mar 12, 2020
Closed
@tomaka
Copy link
Contributor

tomaka commented Mar 12, 2020

I suppose that this PR is safe. If Android didn't have malloc_usable_size then we'd get linking errors, no?

@ordian
Copy link
Member Author

ordian commented Mar 12, 2020

I suppose that this PR is safe. If Android didn't have malloc_usable_size then we'd get linking errors, no?

Unfortunately no, let me try to test cross-compile before merging the PR. Ideally we want to setup CI for android (#357).

@ordian
Copy link
Member Author

ordian commented Mar 12, 2020 •
edited
Loading 

$ cross test --target=aarch64-linux-android -p parity-util-mem
     Running /target/aarch64-linux-android/debug/deps/parity_util_mem-cb2ecd9775fac060

running 8 tests
test malloc_size::tests::btree_set ... ok
test malloc_size::tests::special_malloc_size_of_0 ... ok
test malloc_size::tests::test_smallvec_boxed_stack_allocated_type ... ok
test malloc_size::tests::test_smallvec_heap_allocated_type ... ok
test malloc_size::tests::test_smallvec_stack_allocated_type ... ok
test primitives_impls::tests::smoky ... ok
test test::test_arc ... ok
test test::test_dyn ... ok

test result: ok. 8 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out

     Running /target/aarch64-linux-android/debug/deps/derive-387ff7c68eee55fc

running 5 tests
test derive_hashmap ... ok
test derive_ignore ... ok
test derive_morecomplex ... ok
test derive_tuple ... ok
test derive_vec ... ok

test result: ok. 5 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out

seems to work (and fails on master as expected)

@dvdplm
Copy link
Contributor

dvdplm commented Mar 12, 2020

Release notes are missing, feel free to add here or in upcoming release-prep PR.

@ordian ordian merged commit 2f3167d into master Mar 12, 2020
@ordian ordian deleted the ao-malloc-size-of-on-android branch March 12, 2020 23:02
ordian added a commit that referenced this pull request Mar 12, 2020
@ordian
Merge branch 'master' into ao-update-mimalloc
7949917 
* master:
  parity-util-mem: use malloc for usable_size on android (#355)
  CI: troubleshoot macOS build (#356)
ordian added a commit that referenced this pull request Mar 12, 2020
@ordian
Merge branch 'master' into ao-kvdb-remove-unused-dependency
74770eb 
* master:
  parity-util-mem: use malloc for usable_size on android (#355)
  CI: troubleshoot macOS build (#356)
ordian added a commit that referenced this pull request Mar 12, 2020
@ordian
Merge branch 'master' into ao-ci-android
df125ea 
* master:
  parity-util-mem: use malloc for usable_size on android (#355)
  CI: troubleshoot macOS build (#356)
ordian added a commit that referenced this pull request Mar 14, 2020
@ordian
Merge branch 'master' into ao-kvdb-sled
c02c091 
* master:
  parity-util-mem: prepare release for 0.5.2 (#359)
  travis: test parity-util-mem on android (#358)
  parity-util-mem: update mimalloc feature (#352)
  kvdb: remove parity-bytes dependency (#351)
  parity-util-mem: use malloc for usable_size on android (#355)
  CI: troubleshoot macOS build (#356)
ordian added a commit that referenced this pull request Mar 16, 2020
@ordian
Merge branch 'master' into ao-no-overlay
2fe0a11 
* master:
  parity-util-mem: prepare release for 0.5.2 (#359)
  travis: test parity-util-mem on android (#358)
  parity-util-mem: update mimalloc feature (#352)
  kvdb: remove parity-bytes dependency (#351)
  parity-util-mem: use malloc for usable_size on android (#355)
  CI: troubleshoot macOS build (#356)
ordian added a commit that referenced this pull request Apr 22, 2020
@ordian
Merge branch 'master' into ao-rocksdb-new-format
08af3ed 
* master:
  kvdb-rocksdb: optimize and rename iter_from_prefix  (#365)
  bump parity-util-mem (#376)
  parity-util-mem: fix for windows (#375)
  keccak-hash: fix bench and add one for range (#372)
  [parity-crypto] Release 0.6.1 (#373)
  keccak-hash: bump version to 0.5.1 (#371)
  keccak-hash: add keccak256_range and keccak512_range functions (#370)
  Allow pubkey recovery for all-zero messages (#369)
  Delete by prefix operator in kvdb (#360)
  kvdb: no overlay (#313)
  Ban duplicates of parity-uil-mem from being linked into the same program (#363)
  Use correct license ID (#362)
  Memtest example for Rocksdb (#349)
  Prep for release (#361)
  parity-util-mem: prepare release for 0.5.2 (#359)
  travis: test parity-util-mem on android (#358)
  parity-util-mem: update mimalloc feature (#352)
  kvdb: remove parity-bytes dependency (#351)
  parity-util-mem: use malloc for usable_size on android (#355)
  CI: troubleshoot macOS build (#356)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dvdplm dvdplm dvdplm approved these changes

@tomaka tomaka tomaka approved these changes

Assignees
No one assigned
Labels
A0-pleasereview
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

MallocSizeOf panics on Android
3 participants
@ordian @tomaka @dvdplm