From b86ef055d270befa08cf8121e4e2336347ab11c9 Mon Sep 17 00:00:00 2001 From: Alessandro Decina Date: Mon, 17 Jun 2024 14:23:52 +1000 Subject: [PATCH] Move mem_pool to program-runtime --- program-runtime/src/lib.rs | 1 + {programs/bpf_loader => program-runtime}/src/mem_pool.rs | 0 programs/bpf_loader/src/lib.rs | 3 +-- 3 files changed, 2 insertions(+), 2 deletions(-) rename {programs/bpf_loader => program-runtime}/src/mem_pool.rs (100%) diff --git a/program-runtime/src/lib.rs b/program-runtime/src/lib.rs index ef2832522db95b..3627569bc568ee 100644 --- a/program-runtime/src/lib.rs +++ b/program-runtime/src/lib.rs @@ -12,6 +12,7 @@ pub use solana_rbpf; pub mod invoke_context; pub mod loaded_programs; pub mod log_collector; +pub mod mem_pool; pub mod stable_log; pub mod sysvar_cache; pub mod timings; diff --git a/programs/bpf_loader/src/mem_pool.rs b/program-runtime/src/mem_pool.rs similarity index 100% rename from programs/bpf_loader/src/mem_pool.rs rename to program-runtime/src/mem_pool.rs diff --git a/programs/bpf_loader/src/lib.rs b/programs/bpf_loader/src/lib.rs index 4b13f33ad4d62c..18d2f4d5f3d42a 100644 --- a/programs/bpf_loader/src/lib.rs +++ b/programs/bpf_loader/src/lib.rs @@ -1,12 +1,10 @@ #![deny(clippy::arithmetic_side_effects)] #![deny(clippy::indexing_slicing)] -pub mod mem_pool; pub mod serialization; pub mod syscalls; use { - mem_pool::VmMemoryPool, solana_compute_budget::compute_budget::MAX_INSTRUCTION_STACK_DEPTH, solana_measure::measure::Measure, solana_program_runtime::{ @@ -17,6 +15,7 @@ use { DELAY_VISIBILITY_SLOT_OFFSET, }, log_collector::LogCollector, + mem_pool::VmMemoryPool, stable_log, sysvar_cache::get_sysvar_with_account_check, },