SVM: API method for setting cache fork graph

core/tests/unified_scheduler.rs

@@ -83,7 +83,7 @@ fn test_scheduler_waited_by_drop_bank_service() {
  bank_forks.write().unwrap().install_scheduler_pool(pool);
  let genesis = 0;
  let genesis_bank = &bank_forks.read().unwrap().get(genesis).unwrap();
- genesis_bank.set_fork_graph_in_program_cache(Arc::downgrade(&bank_forks));
+ genesis_bank.set_fork_graph_in_program_cache(Arc::clone(&bank_forks));
 
  // Create bank, which is pruned later
  let pruned = 2;

runtime/src/bank.rs

@@ -192,7 +192,7 @@ use {
  AtomicBool, AtomicI64, AtomicU64, AtomicUsize,
  Ordering::{AcqRel, Acquire, Relaxed},
  },
- Arc, LockResult, Mutex, RwLock, RwLockReadGuard, RwLockWriteGuard, Weak,
+ Arc, LockResult, Mutex, RwLock, RwLockReadGuard, RwLockWriteGuard,
  },
  thread::Builder,
  time::{Duration, Instant},
@@ -1420,12 +1420,9 @@ impl Bank {
  new
  }
 
- pub fn set_fork_graph_in_program_cache(&self, fork_graph: Weak<RwLock<BankForks>>) {
+ pub fn set_fork_graph_in_program_cache(&self, fork_graph: Arc<RwLock<BankForks>>) {
  self.transaction_processor
- .program_cache
- .write()
- .unwrap()
- .set_fork_graph(fork_graph);
+ .set_fork_graph_in_program_cache(fork_graph);
  }
 
  pub fn prune_program_cache(&self, new_root_slot: Slot, new_root_epoch: Epoch) {

runtime/src/bank_forks.rs

@@ -130,7 +130,7 @@ impl BankForks {
  scheduler_pool: None,
  }));
 
- root_bank.set_fork_graph_in_program_cache(Arc::downgrade(&bank_forks));
+ root_bank.set_fork_graph_in_program_cache(Arc::clone(&bank_forks));
  bank_forks
  }
 

svm/examples/json-rpc/server/src/svm_bridge.rs

@@ -203,6 +203,8 @@ pub fn create_executable_environment(
  mock_bank: &mut MockBankCallback,
  transaction_processor: &TransactionBatchProcessor<MockForkGraph>,
 ) {
+ transaction_processor.set_fork_graph_in_program_cache(fork_graph);
+
  let mut program_cache = transaction_processor.program_cache.write().unwrap();
 
  program_cache.environments = ProgramRuntimeEnvironments {
@@ -214,7 +216,6 @@ pub fn create_executable_environment(
  )),
  };
 
- program_cache.fork_graph = Some(Arc::downgrade(&fork_graph));
  // add programs to cache
  for key in account_keys.iter() {
  if let Some(account) = mock_bank.get_account_shared_data(key) {

svm/examples/paytube/src/lib.rs

@@ -140,7 +140,7 @@ impl PayTubeChannel {
  &account_loader,
  &feature_set,
  &compute_budget,
- Arc::clone(&fork_graph),
+ fork_graph,
  );
 
  // The PayTube transaction processing runtime environment.

svm/examples/paytube/src/processor.rs

@@ -41,14 +41,12 @@ pub(crate) fn create_transaction_batch_processor<CB: TransactionProcessingCallba
  fork_graph: Arc<RwLock<PayTubeForkGraph>>,
 ) -> TransactionBatchProcessor<PayTubeForkGraph> {
  let processor = TransactionBatchProcessor::<PayTubeForkGraph>::default();
+ // Initialize the mocked fork graph.
+ processor.set_fork_graph_in_program_cache(fork_graph);
 
  {
  let mut cache = processor.program_cache.write().unwrap();
 
- // Initialize the mocked fork graph.
- // let fork_graph = Arc::new(RwLock::new(PayTubeForkGraph {}));
- cache.fork_graph = Some(Arc::downgrade(&fork_graph));
-
  // Initialize a proper cache environment.
  // (Use Loader v4 program to initialize runtime v2 if desired)
  cache.environments.program_runtime_v1 = Arc::new(

svm/src/transaction_processor.rs

@@ -209,6 +209,13 @@ impl<FG: ForkGraph> TransactionBatchProcessor<FG> {
  }
  }
 
+ pub fn set_fork_graph_in_program_cache(&self, fork_graph: Arc<RwLock<FG>>) {
+ self.program_cache
+ .write()
+ .unwrap()
+ .set_fork_graph(Arc::downgrade(&fork_graph));
+ }
+
  /// Returns the current environments depending on the given epoch
  /// Returns None if the call could result in a deadlock
  #[cfg(feature = "dev-context-only-utils")]
@@ -1300,8 +1307,8 @@ mod tests {
  let mock_bank = MockBankCallback::default();
  let batch_processor = TransactionBatchProcessor::<TestForkGraph>::default();
  let fork_graph = Arc::new(RwLock::new(TestForkGraph {}));
- batch_processor.program_cache.write().unwrap().fork_graph =
- Some(Arc::downgrade(&fork_graph));
+ batch_processor.set_fork_graph_in_program_cache(fork_graph);
+
  let key = Pubkey::new_unique();
 
  let mut account_maps: HashMap<Pubkey, u64> = HashMap::new();
@@ -1315,8 +1322,8 @@ mod tests {
  let mock_bank = MockBankCallback::default();
  let batch_processor = TransactionBatchProcessor::<TestForkGraph>::default();
  let fork_graph = Arc::new(RwLock::new(TestForkGraph {}));
- batch_processor.program_cache.write().unwrap().fork_graph =
- Some(Arc::downgrade(&fork_graph));
+ batch_processor.set_fork_graph_in_program_cache(fork_graph);
+
  let key = Pubkey::new_unique();
 
  let mut account_data = AccountSharedData::default();
@@ -1803,8 +1810,7 @@ mod tests {
  let mock_bank = MockBankCallback::default();
  let batch_processor = TransactionBatchProcessor::<TestForkGraph>::default();
  let fork_graph = Arc::new(RwLock::new(TestForkGraph {}));
- batch_processor.program_cache.write().unwrap().fork_graph =
- Some(Arc::downgrade(&fork_graph));
+ batch_processor.set_fork_graph_in_program_cache(fork_graph);
 
  let key = Pubkey::new_unique();
  let name = "a_builtin_name";

svm/tests/concurrent_tests.rs

@@ -42,7 +42,7 @@ fn program_cache_execution(threads: usize) {
  let mut mock_bank = MockBankCallback::default();
  let batch_processor = TransactionBatchProcessor::<MockForkGraph>::new(5, 5, HashSet::new());
  let fork_graph = Arc::new(RwLock::new(MockForkGraph {}));
- batch_processor.program_cache.write().unwrap().fork_graph = Some(Arc::downgrade(&fork_graph));
+ batch_processor.set_fork_graph_in_program_cache(fork_graph);
 
  let programs = vec![
  deploy_program("hello-solana".to_string(), 0, &mut mock_bank),
@@ -131,7 +131,7 @@ fn svm_concurrent() {
  2,
  HashSet::new(),
  ));
- let fork_graph = Arc::new(RwLock::new(MockForkGraph {}));
+ batch_processor.set_fork_graph_in_program_cache(Arc::new(RwLock::new(MockForkGraph {})));
 
  create_executable_environment(
  fork_graph.clone(),

svm/tests/conformance.rs

@@ -245,8 +245,8 @@ fn run_fixture(fixture: InstrFixture, filename: OsString, execute_as_instr: bool
 
  mock_bank.override_feature_set(feature_set);
  let batch_processor = TransactionBatchProcessor::<MockForkGraph>::new(42, 2, HashSet::new());
+ batch_processor.set_fork_graph_in_program_cache(Arc::new(RwLock::new(MockForkGraph {})));
 
- let fork_graph = Arc::new(RwLock::new(MockForkGraph {}));
  {
  let mut program_cache = batch_processor.program_cache.write().unwrap();
  program_cache.environments = ProgramRuntimeEnvironments {
@@ -256,7 +256,6 @@ fn run_fixture(fixture: InstrFixture, filename: OsString, execute_as_instr: bool
  FunctionRegistry::default(),
  )),
  };
- program_cache.fork_graph = Some(Arc::downgrade(&fork_graph.clone()));
  }
 
  batch_processor.fill_missing_sysvar_cache_entries(&mock_bank);

svm/tests/integration_test.rs

@@ -877,11 +877,9 @@ fn execute_test_entry(test_entry: SvmTestEntry) {
  EXECUTION_EPOCH,
  HashSet::new(),
  );
-
- let fork_graph = Arc::new(RwLock::new(MockForkGraph {}));
+ batch_processor.set_fork_graph_in_program_cache(Arc::new(RwLock::new(MockForkGraph {})));
 
  create_executable_environment(
- fork_graph.clone(),
  &mock_bank,
  &mut batch_processor.program_cache.write().unwrap(),
  );
@@ -1064,11 +1062,9 @@ fn svm_inspect_account() {
  EXECUTION_EPOCH,
  HashSet::new(),
  );
-
- let fork_graph = Arc::new(RwLock::new(MockForkGraph {}));
+ batch_processor.set_fork_graph_in_program_cache(Arc::new(RwLock::new(MockForkGraph {})));
 
  create_executable_environment(
- fork_graph.clone(),
  &mock_bank,
  &mut batch_processor.program_cache.write().unwrap(),
  );

svm/tests/mock_bank.rs

@@ -201,7 +201,6 @@ pub fn deploy_program_with_upgrade_authority(
 
 #[allow(unused)]
 pub fn create_executable_environment(
- fork_graph: Arc<RwLock<MockForkGraph>>,
  mock_bank: &MockBankCallback,
  program_cache: &mut ProgramCache<MockForkGraph>,
 ) {
@@ -214,8 +213,6 @@ pub fn create_executable_environment(
  )),
  };
 
- program_cache.fork_graph = Some(Arc::downgrade(&fork_graph));
-
  // We must fill in the sysvar cache entries
 
  // clock contents are important because we use them for a sysvar loading test

unified-scheduler-pool/src/lib.rs

@@ -2221,7 +2221,7 @@ mod tests {
  let slot = bank.slot();
  let bank_fork = BankForks::new_rw_arc(bank);
  let bank = bank_fork.read().unwrap().get(slot).unwrap();
- bank.set_fork_graph_in_program_cache(Arc::downgrade(&bank_fork));
+ bank.set_fork_graph_in_program_cache(Arc::clone(&bank_fork));
  (bank, bank_fork)
  }