Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Macos heapsize force jemalloc #10234

Merged
merged 13 commits into from
Jan 29, 2019
Merged

Macos heapsize force jemalloc #10234

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
404d2d8
Switch to non prefixed malloc_size_of on macos
cheme Jan 22, 2019
8ffe81d
Fix
cheme Jan 23, 2019
05af36e
Testing darwin build
cheme Jan 23, 2019
175a3f3
Fix import
cheme Jan 23, 2019
d1b4d71
conflict
cheme Jan 23, 2019
e0d2198
switch heapsize deps commit
cheme Jan 23, 2019
1443392
switch heapsize commit
cheme Jan 23, 2019
46d9ca8
Rename branch
cheme Jan 23, 2019
ec3b394
Restore gitlab ci to origin
cheme Jan 23, 2019
9168d5e
Merge branch 'master' into macfix2
cheme Jan 23, 2019
2f00bbe
test for mac
cheme Jan 25, 2019
bd5ff79
mac tests?
cheme Jan 25, 2019
ece81a1
Switch of macos CI tests.
cheme Jan 28, 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
62 changes: 45 additions & 17 deletions Cargo.lock
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,3 +134,6 @@ members = [
"parity-clib",
"whisper/cli",
]

[patch.crates-io]
heapsize = { git = "https://github.com/cheme/heapsize.git", branch = "ec-macfix" }
2 changes: 1 addition & 1 deletion rpc/src/v1/impls/personal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ use std::time::Duration;
use bytes::Bytes;
use ethcore::account_provider::AccountProvider;
use types::transaction::PendingTransaction;
use types::transaction::SignedTransaction;
cheme marked this conversation as resolved.
Show resolved Hide resolved
use ethereum_types::{H520, U128, Address};
use ethkey::{public_to_address, recover, Signature};

Expand All @@ -41,7 +42,6 @@ use v1::types::{
use v1::metadata::Metadata;
use eip_712::{EIP712, hash_structured_data};
use jsonrpc_core::types::Value;
use transaction::SignedTransaction;

/// Account management (personal) rpc implementation.
pub struct PersonalClient<D: Dispatcher> {
Expand Down