refactor: replace lol_alloc with dlmalloc (#4857)

Signed-off-by: Shanin Roman <[email protected]>
hyperledger-iroha · Jul 17, 2024 · aaeab13 · aaeab13
1 parent 04d2be0
commit aaeab13
Show file tree

Hide file tree

Showing 32 changed files with 46 additions and 46 deletions.
diff --git a/client/tests/integration/smartcontracts/Cargo.toml b/client/tests/integration/smartcontracts/Cargo.toml
@@ -53,5 +53,5 @@ serde_json = { version = "1.0.91", default-features = false }
 getrandom = { version = "0.2", features = ["custom"] }
 nonzero_ext = { version = "0.3.0", default-features = false }
 
-lol_alloc = "0.4.0"
+dlmalloc = { version = "0.2.6", features = ["global"] }
 panic-halt = "0.2.0"
diff --git a/client/tests/integration/smartcontracts/create_nft_for_every_user_trigger/Cargo.toml b/client/tests/integration/smartcontracts/create_nft_for_every_user_trigger/Cargo.toml
@@ -14,5 +14,5 @@ crate-type = ['cdylib']
 iroha_trigger.workspace = true
 
 panic-halt.workspace = true
-lol_alloc.workspace = true
+dlmalloc.workspace = true
 getrandom.workspace = true
diff --git a/client/tests/integration/smartcontracts/create_nft_for_every_user_trigger/src/lib.rs b/client/tests/integration/smartcontracts/create_nft_for_every_user_trigger/src/lib.rs
@@ -7,11 +7,11 @@ extern crate panic_halt;
 
 use alloc::{format, string::ToString};
 
+use dlmalloc::GlobalDlmalloc;
 use iroha_trigger::prelude::*;
-use lol_alloc::{FreeListAllocator, LockedAllocator};
 
 #[global_allocator]
-static ALLOC: LockedAllocator<FreeListAllocator> = LockedAllocator::new(FreeListAllocator::new());
+static ALLOC: GlobalDlmalloc = GlobalDlmalloc;
 
 getrandom::register_custom_getrandom!(iroha_trigger::stub_getrandom);
 

diff --git a/client/tests/integration/smartcontracts/executor_custom_instructions_complex/Cargo.toml b/client/tests/integration/smartcontracts/executor_custom_instructions_complex/Cargo.toml
@@ -19,5 +19,5 @@ serde_json.workspace = true
 serde.workspace = true
 
 panic-halt.workspace = true
-lol_alloc.workspace = true
+dlmalloc.workspace = true
 getrandom.workspace = true
diff --git a/client/tests/integration/smartcontracts/executor_custom_instructions_complex/src/lib.rs b/client/tests/integration/smartcontracts/executor_custom_instructions_complex/src/lib.rs
@@ -10,17 +10,17 @@ extern crate alloc;
 #[cfg(not(test))]
 extern crate panic_halt;
 
+use dlmalloc::GlobalDlmalloc;
 use executor_custom_data_model::complex_isi::{
     ConditionalExpr, CoreExpr, CustomInstructionExpr, Evaluate, Value,
 };
 use iroha_executor::{
     data_model::{isi::CustomInstruction, query::QueryOutputBox},
     prelude::*,
 };
-use lol_alloc::{FreeListAllocator, LockedAllocator};
 
 #[global_allocator]
-static ALLOC: LockedAllocator<FreeListAllocator> = LockedAllocator::new(FreeListAllocator::new());
+static ALLOC: GlobalDlmalloc = GlobalDlmalloc;
 
 getrandom::register_custom_getrandom!(iroha_executor::stub_getrandom);
 

diff --git a/client/tests/integration/smartcontracts/executor_custom_instructions_simple/Cargo.toml b/client/tests/integration/smartcontracts/executor_custom_instructions_simple/Cargo.toml
@@ -19,5 +19,5 @@ serde_json.workspace = true
 serde.workspace = true
 
 panic-halt.workspace = true
-lol_alloc.workspace = true
+dlmalloc.workspace = true
 getrandom.workspace = true
diff --git a/client/tests/integration/smartcontracts/executor_custom_instructions_simple/src/lib.rs b/client/tests/integration/smartcontracts/executor_custom_instructions_simple/src/lib.rs
@@ -8,12 +8,12 @@ extern crate alloc;
 #[cfg(not(test))]
 extern crate panic_halt;
 
+use dlmalloc::GlobalDlmalloc;
 use executor_custom_data_model::simple_isi::{CustomInstructionBox, MintAssetForAllAccounts};
 use iroha_executor::{data_model::isi::CustomInstruction, debug::DebugExpectExt, prelude::*};
-use lol_alloc::{FreeListAllocator, LockedAllocator};
 
 #[global_allocator]
-static ALLOC: LockedAllocator<FreeListAllocator> = LockedAllocator::new(FreeListAllocator::new());
+static ALLOC: GlobalDlmalloc = GlobalDlmalloc;
 
 getrandom::register_custom_getrandom!(iroha_executor::stub_getrandom);
 

diff --git a/client/tests/integration/smartcontracts/executor_remove_permission/Cargo.toml b/client/tests/integration/smartcontracts/executor_remove_permission/Cargo.toml
@@ -21,5 +21,5 @@ serde_json.workspace = true
 serde.workspace = true
 
 panic-halt.workspace = true
-lol_alloc.workspace = true
+dlmalloc.workspace = true
 getrandom.workspace = true
diff --git a/client/tests/integration/smartcontracts/executor_remove_permission/src/lib.rs b/client/tests/integration/smartcontracts/executor_remove_permission/src/lib.rs
@@ -6,12 +6,12 @@
 #[cfg(not(test))]
 extern crate panic_halt;
 
+use dlmalloc::GlobalDlmalloc;
 use iroha_executor::{prelude::*, DataModelBuilder};
 use iroha_executor_data_model::permission::domain::CanUnregisterDomain;
-use lol_alloc::{FreeListAllocator, LockedAllocator};
 
 #[global_allocator]
-static ALLOC: LockedAllocator<FreeListAllocator> = LockedAllocator::new(FreeListAllocator::new());
+static ALLOC: GlobalDlmalloc = GlobalDlmalloc;
 
 getrandom::register_custom_getrandom!(iroha_executor::stub_getrandom);
 

diff --git a/client/tests/integration/smartcontracts/executor_with_admin/Cargo.toml b/client/tests/integration/smartcontracts/executor_with_admin/Cargo.toml
@@ -15,5 +15,5 @@ iroha_executor.workspace = true
 iroha_schema.workspace = true
 
 panic-halt.workspace = true
-lol_alloc.workspace = true
+dlmalloc.workspace = true
 getrandom.workspace = true
diff --git a/client/tests/integration/smartcontracts/executor_with_admin/src/lib.rs b/client/tests/integration/smartcontracts/executor_with_admin/src/lib.rs
@@ -6,11 +6,11 @@
 #[cfg(not(test))]
 extern crate panic_halt;
 
+use dlmalloc::GlobalDlmalloc;
 use iroha_executor::prelude::*;
-use lol_alloc::{FreeListAllocator, LockedAllocator};
 
 #[global_allocator]
-static ALLOC: LockedAllocator<FreeListAllocator> = LockedAllocator::new(FreeListAllocator::new());
+static ALLOC: GlobalDlmalloc = GlobalDlmalloc;
 
 getrandom::register_custom_getrandom!(iroha_executor::stub_getrandom);
 

diff --git a/client/tests/integration/smartcontracts/executor_with_custom_parameter/Cargo.toml b/client/tests/integration/smartcontracts/executor_with_custom_parameter/Cargo.toml
@@ -22,5 +22,5 @@ serde_json.workspace = true
 serde.workspace = true
 
 panic-halt.workspace = true
-lol_alloc.workspace = true
+dlmalloc.workspace = true
 getrandom.workspace = true
diff --git a/client/tests/integration/smartcontracts/executor_with_custom_parameter/src/lib.rs b/client/tests/integration/smartcontracts/executor_with_custom_parameter/src/lib.rs
@@ -7,13 +7,13 @@ extern crate panic_halt;
 
 use alloc::format;
 
+use dlmalloc::GlobalDlmalloc;
 use executor_custom_data_model::parameters::DomainLimits;
 use iroha_executor::{prelude::*, DataModelBuilder};
 use iroha_executor_data_model::parameter::Parameter;
-use lol_alloc::{FreeListAllocator, LockedAllocator};
 
 #[global_allocator]
-static ALLOC: LockedAllocator<FreeListAllocator> = LockedAllocator::new(FreeListAllocator::new());
+static ALLOC: GlobalDlmalloc = GlobalDlmalloc;
 
 getrandom::register_custom_getrandom!(iroha_executor::stub_getrandom);
 

diff --git a/client/tests/integration/smartcontracts/executor_with_custom_permission/Cargo.toml b/client/tests/integration/smartcontracts/executor_with_custom_permission/Cargo.toml
@@ -22,5 +22,5 @@ serde_json.workspace = true
 serde.workspace = true
 
 panic-halt.workspace = true
-lol_alloc.workspace = true
+dlmalloc.workspace = true
 getrandom.workspace = true
diff --git a/client/tests/integration/smartcontracts/executor_with_custom_permission/src/lib.rs b/client/tests/integration/smartcontracts/executor_with_custom_permission/src/lib.rs
@@ -16,15 +16,15 @@ extern crate alloc;
 #[cfg(not(test))]
 extern crate panic_halt;
 
+use dlmalloc::GlobalDlmalloc;
 use executor_custom_data_model::permissions::CanControlDomainLives;
 use iroha_executor::{
     data_model::prelude::*, permission::ExecutorPermision as _, prelude::*, DataModelBuilder,
 };
 use iroha_executor_data_model::permission::domain::CanUnregisterDomain;
-use lol_alloc::{FreeListAllocator, LockedAllocator};
 
 #[global_allocator]
-static ALLOC: LockedAllocator<FreeListAllocator> = LockedAllocator::new(FreeListAllocator::new());
+static ALLOC: GlobalDlmalloc = GlobalDlmalloc;
 
 getrandom::register_custom_getrandom!(iroha_executor::stub_getrandom);
 

diff --git a/client/tests/integration/smartcontracts/executor_with_migration_fail/Cargo.toml b/client/tests/integration/smartcontracts/executor_with_migration_fail/Cargo.toml
@@ -15,5 +15,5 @@ iroha_executor.workspace = true
 anyhow.workspace = true
 
 panic-halt.workspace = true
-lol_alloc.workspace = true
+dlmalloc.workspace = true
 getrandom.workspace = true
diff --git a/client/tests/integration/smartcontracts/executor_with_migration_fail/src/lib.rs b/client/tests/integration/smartcontracts/executor_with_migration_fail/src/lib.rs
@@ -6,11 +6,11 @@ extern crate alloc;
 #[cfg(not(test))]
 extern crate panic_halt;
 
+use dlmalloc::GlobalDlmalloc;
 use iroha_executor::{debug::dbg_panic, prelude::*};
-use lol_alloc::{FreeListAllocator, LockedAllocator};
 
 #[global_allocator]
-static ALLOC: LockedAllocator<FreeListAllocator> = LockedAllocator::new(FreeListAllocator::new());
+static ALLOC: GlobalDlmalloc = GlobalDlmalloc;
 
 getrandom::register_custom_getrandom!(iroha_executor::stub_getrandom);
 

diff --git a/client/tests/integration/smartcontracts/mint_rose_trigger/Cargo.toml b/client/tests/integration/smartcontracts/mint_rose_trigger/Cargo.toml
@@ -14,5 +14,5 @@ crate-type = ['cdylib']
 iroha_trigger.workspace = true
 
 panic-halt.workspace = true
-lol_alloc.workspace = true
+dlmalloc.workspace = true
 getrandom.workspace = true
diff --git a/client/tests/integration/smartcontracts/mint_rose_trigger/src/lib.rs b/client/tests/integration/smartcontracts/mint_rose_trigger/src/lib.rs
@@ -7,11 +7,11 @@ extern crate panic_halt;
 
 use core::str::FromStr as _;
 
+use dlmalloc::GlobalDlmalloc;
 use iroha_trigger::prelude::*;
-use lol_alloc::{FreeListAllocator, LockedAllocator};
 
 #[global_allocator]
-static ALLOC: LockedAllocator<FreeListAllocator> = LockedAllocator::new(FreeListAllocator::new());
+static ALLOC: GlobalDlmalloc = GlobalDlmalloc;
 
 getrandom::register_custom_getrandom!(iroha_trigger::stub_getrandom);
 

diff --git a/client/tests/integration/smartcontracts/mint_rose_trigger_args/Cargo.toml b/client/tests/integration/smartcontracts/mint_rose_trigger_args/Cargo.toml
@@ -15,7 +15,7 @@ iroha_trigger.workspace = true
 executor_custom_data_model.workspace = true
 
 panic-halt.workspace = true
-lol_alloc.workspace = true
+dlmalloc.workspace = true
 getrandom.workspace = true
 
 serde = { workspace = true, features = ["derive"] }

diff --git a/client/tests/integration/smartcontracts/mint_rose_trigger_args/src/lib.rs b/client/tests/integration/smartcontracts/mint_rose_trigger_args/src/lib.rs
@@ -7,12 +7,12 @@ extern crate panic_halt;
 
 use core::str::FromStr as _;
 
+use dlmalloc::GlobalDlmalloc;
 use executor_custom_data_model::mint_rose_args::MintRoseArgs;
 use iroha_trigger::{debug::dbg_panic, prelude::*};
-use lol_alloc::{FreeListAllocator, LockedAllocator};
 
 #[global_allocator]
-static ALLOC: LockedAllocator<FreeListAllocator> = LockedAllocator::new(FreeListAllocator::new());
+static ALLOC: GlobalDlmalloc = GlobalDlmalloc;
 
 getrandom::register_custom_getrandom!(iroha_trigger::stub_getrandom);
 

diff --git a/client/tests/integration/smartcontracts/multisig/Cargo.toml b/client/tests/integration/smartcontracts/multisig/Cargo.toml
@@ -15,7 +15,7 @@ iroha_trigger.workspace = true
 executor_custom_data_model.workspace = true
 
 panic-halt.workspace = true
-lol_alloc.workspace = true
+dlmalloc.workspace = true
 getrandom.workspace = true
 
 serde = { workspace = true, features = ["derive"] }

diff --git a/client/tests/integration/smartcontracts/multisig/src/lib.rs b/client/tests/integration/smartcontracts/multisig/src/lib.rs
@@ -8,12 +8,12 @@ extern crate panic_halt;
 
 use alloc::{collections::btree_set::BTreeSet, format, vec::Vec};
 
+use dlmalloc::GlobalDlmalloc;
 use executor_custom_data_model::multisig::MultisigArgs;
 use iroha_trigger::{debug::dbg_panic, prelude::*};
-use lol_alloc::{FreeListAllocator, LockedAllocator};
 
 #[global_allocator]
-static ALLOC: LockedAllocator<FreeListAllocator> = LockedAllocator::new(FreeListAllocator::new());
+static ALLOC: GlobalDlmalloc = GlobalDlmalloc;
 
 getrandom::register_custom_getrandom!(iroha_trigger::stub_getrandom);
 

diff --git a/client/tests/integration/smartcontracts/multisig_register/Cargo.toml b/client/tests/integration/smartcontracts/multisig_register/Cargo.toml
@@ -16,7 +16,7 @@ iroha_executor_data_model.workspace = true
 executor_custom_data_model.workspace = true
 
 panic-halt.workspace = true
-lol_alloc.workspace = true
+dlmalloc.workspace = true
 getrandom.workspace = true
 
 serde = { workspace = true, features = ["derive"] }

diff --git a/client/tests/integration/smartcontracts/multisig_register/src/lib.rs b/client/tests/integration/smartcontracts/multisig_register/src/lib.rs
@@ -8,13 +8,13 @@ extern crate panic_halt;
 
 use alloc::format;
 
+use dlmalloc::GlobalDlmalloc;
 use executor_custom_data_model::multisig::MultisigRegisterArgs;
 use iroha_executor_data_model::permission::trigger::CanExecuteUserTrigger;
 use iroha_trigger::{debug::dbg_panic, prelude::*};
-use lol_alloc::{FreeListAllocator, LockedAllocator};
 
 #[global_allocator]
-static ALLOC: LockedAllocator<FreeListAllocator> = LockedAllocator::new(FreeListAllocator::new());
+static ALLOC: GlobalDlmalloc = GlobalDlmalloc;
 
 getrandom::register_custom_getrandom!(iroha_trigger::stub_getrandom);
 

diff --git a/client/tests/integration/smartcontracts/query_assets_and_save_cursor/Cargo.toml b/client/tests/integration/smartcontracts/query_assets_and_save_cursor/Cargo.toml
@@ -14,7 +14,7 @@ crate-type = ['cdylib']
 iroha_smart_contract.workspace = true
 
 panic-halt.workspace = true
-lol_alloc.workspace = true
+dlmalloc.workspace = true
 getrandom.workspace = true
 parity-scale-codec.workspace = true
 nonzero_ext.workspace = true

diff --git a/client/tests/integration/smartcontracts/query_assets_and_save_cursor/src/lib.rs b/client/tests/integration/smartcontracts/query_assets_and_save_cursor/src/lib.rs
@@ -7,13 +7,13 @@ extern crate panic_halt;
 
 extern crate alloc;
 
+use dlmalloc::GlobalDlmalloc;
 use iroha_smart_contract::{data_model::query::cursor::ForwardCursor, prelude::*};
-use lol_alloc::{FreeListAllocator, LockedAllocator};
 use nonzero_ext::nonzero;
 use parity_scale_codec::{Decode, DecodeAll, Encode};
 
 #[global_allocator]
-static ALLOC: LockedAllocator<FreeListAllocator> = LockedAllocator::new(FreeListAllocator::new());
+static ALLOC: GlobalDlmalloc = GlobalDlmalloc;
 
 getrandom::register_custom_getrandom!(iroha_smart_contract::stub_getrandom);
 

diff --git a/client/tests/integration/smartcontracts/smart_contract_can_filter_queries/Cargo.toml b/client/tests/integration/smartcontracts/smart_contract_can_filter_queries/Cargo.toml
@@ -14,7 +14,7 @@ crate-type = ['cdylib']
 iroha_smart_contract.workspace = true
 
 panic-halt.workspace = true
-lol_alloc.workspace = true
+dlmalloc.workspace = true
 getrandom.workspace = true
 parity-scale-codec.workspace = true
 nonzero_ext.workspace = true

diff --git a/client/tests/integration/smartcontracts/smart_contract_can_filter_queries/src/lib.rs b/client/tests/integration/smartcontracts/smart_contract_can_filter_queries/src/lib.rs
@@ -9,15 +9,15 @@ extern crate alloc;
 
 use alloc::{collections::BTreeSet, string::ToString, vec::Vec};
 
+use dlmalloc::GlobalDlmalloc;
 use iroha_smart_contract::{
     data_model::query::predicate::{string::StringPredicate, value::QueryOutputPredicate},
     prelude::*,
     QueryOutputCursor,
 };
-use lol_alloc::{FreeListAllocator, LockedAllocator};
 
 #[global_allocator]
-static ALLOC: LockedAllocator<FreeListAllocator> = LockedAllocator::new(FreeListAllocator::new());
+static ALLOC: GlobalDlmalloc = GlobalDlmalloc;
 
 getrandom::register_custom_getrandom!(iroha_smart_contract::stub_getrandom);
 

diff --git a/configs/swarm/executor.wasm b/configs/swarm/executor.wasm
diff --git a/default_executor/Cargo.toml b/default_executor/Cargo.toml
@@ -27,5 +27,5 @@ codegen-units = 1   # Further reduces binary size but increases compilation time
 iroha_executor = { version = "2.0.0-pre-rc.21", path = "../smart_contract/executor", features = ["debug"] }
 getrandom = { version = "0.2", features = ["custom"] }
 
-lol_alloc = "0.4.0"
+dlmalloc = { version = "0.2.6", features = ["global"] }
 panic-halt = "0.2.0"
diff --git a/default_executor/src/lib.rs b/default_executor/src/lib.rs
@@ -6,11 +6,11 @@ extern crate alloc;
 #[cfg(not(test))]
 extern crate panic_halt;
 
+use dlmalloc::GlobalDlmalloc;
 use iroha_executor::{debug::dbg_panic, prelude::*, DataModelBuilder};
-use lol_alloc::{FreeListAllocator, LockedAllocator};
 
 #[global_allocator]
-static ALLOC: LockedAllocator<FreeListAllocator> = LockedAllocator::new(FreeListAllocator::new());
+static ALLOC: GlobalDlmalloc = GlobalDlmalloc;
 
 getrandom::register_custom_getrandom!(iroha_executor::stub_getrandom);