Skip to content

Fix malloc_size_of for mac #93

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

Merged
dvdplm merged 44 commits into from
May 31, 2019
Merged

Fix malloc_size_of for mac #93

Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
25270be
Mem tools by including trait and specific implementation in the crate
cheme Dec 6, 2018
94bb293
Plug malloc_size_of as a patched copy. Documentation is done by
cheme Dec 7, 2018
197a27d
A few additional impl for parity-eth use
cheme Dec 7, 2018
2a0cc08
Allocators.
cheme Dec 7, 2018
418e03b
heapsize estimation for allocator without use_size fn.
cheme Dec 10, 2018
6105606
Init no_std compat.
cheme Dec 10, 2018
59b4d55
Remove conditianal test code.
cheme Dec 10, 2018
efadc31
Renaming of mem repo to crate name.
cheme Dec 11, 2018
b2f1708
Remove conditional mettering for now (will need some testing to check if
cheme Dec 11, 2018
fb127a7
tab
cheme Dec 11, 2018
d5aa899
Remove features get form malloc_size and simply delete code instead.
cheme Jan 2, 2019
fd9dc92
Update parity-util-mem/README.md
pepyakin Jan 2, 2019
3df427b
Missing windows import
cheme Jan 3, 2019
da88f97
Merge branch 'mem-tools2' of github.com:cheme/parity-common into mem-…
cheme Jan 3, 2019
ef9a5b6
Use self for winapi.
cheme Jan 3, 2019
1b0b2e3
Correct import.
cheme Jan 3, 2019
5340912
shallow size on Arc with malloc return -1 (max val), replacing with
cheme Jan 3, 2019
8ada814
use cfg_if to makes feature choice more explicit.
cheme Jan 7, 2019
61c60b0
Remove servo specific impls (unused).
cheme Jan 9, 2019
767dc90
`estimate_heapsize` in travis.
cheme Jan 9, 2019
9876b65
Merge branch 'master' into mem-tools2
cheme Jan 9, 2019
a8a9b0e
Merge branch 'master' into mem-tools2
cheme Jan 9, 2019
a31851e
Remove last serde and remove servo_arc reference.
cheme Jan 10, 2019
73e8c7e
Add missing version
cheme Jan 10, 2019
64135ac
Use malloc_size_of_derive from crates.
cheme Jan 12, 2019
0437f7e
Rem heapsize constraint and deprecate impl.
cheme Jan 14, 2019
81b2da1
Remove path reference
cheme Jan 14, 2019
6c4a5fd
Remove path for hashdb to avoid trait conflicts.
cheme Jan 14, 2019
99b8ea4
Merge branch 'master' into deprecate_heapsize
cheme Jan 16, 2019
dedef64
Merge branch 'master' into deprecate_heapsize
cheme Jan 22, 2019
a9ca6e1
Restore path in cargo
cheme Jan 22, 2019
c315173
Missing path
cheme Jan 22, 2019
71f7aa8
Added test
cheme Jan 22, 2019
b7bcbc8
fix test
cheme Jan 22, 2019
5e53bf3
Do not use prefixed on mac by default (same with other platform as we
cheme Jan 22, 2019
b667436
Have macos rely upon estimate if default allocator
cheme Jan 22, 2019
85a763e
Need full test for macos without jemalloc
cheme Jan 22, 2019
3682270
String in internal heap measured impl
cheme Jan 22, 2019
566389e
Exclude jmalloc-sys on windows build (ci related)
cheme Jan 22, 2019
08f9ed1
Proper windows checks in cargo.toml
cheme Jan 23, 2019
1856597
Removing 'prefixed_malloc' from condition.
cheme Jan 23, 2019
df84088
arc only for jemalloc-global, escape for windows ci
cheme Jan 23, 2019
233bd99
Merge branch 'master' into deprecate_heapsize
cheme Feb 22, 2019
1a174e3
Merge branch 'master' into deprecate_heapsize
cheme May 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Correct import.
  • Loading branch information
@cheme
cheme committed Jan 3, 2019
commit 1b0b2e33ef97288beccfc8d9bfb952df3dc2b0b1
2 changes: 1 addition & 1 deletion parity-util-mem/src/allocators.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ use alloc::collections::btree_set::BTreeSet;
mod usable_size {
extern crate winapi;

use super::*;
use self::winapi::um::heapapi::{GetProcessHeap, HeapSize, HeapValidate};
use std::os::raw::c_void;

/// Get the size of a heap block.
/// Call windows allocator through `winapi` crate
Expand Down