cost tracker: general tidyness

Author: mmcgee-jump

src/discof/replay/fd_replay_tile.c

@@ -709,11 +709,7 @@ replay_block_start( fd_replay_tile_t *  ctx,
       &is_epoch_boundary );
   if( FD_UNLIKELY( is_epoch_boundary ) ) publish_stake_weights( ctx, stem, bank, 1 );
 
-  int res = fd_runtime_block_execute_prepare( bank, ctx->funk, &xid, ctx->capture_ctx, ctx->runtime_spad );
-  if( FD_UNLIKELY( res!=FD_RUNTIME_EXECUTE_SUCCESS ) ) {
-    FD_LOG_CRIT(( "block prep execute failed" ));
-  }
-
+  FD_TEST( !fd_runtime_block_execute_prepare( bank, ctx->funk, &xid, ctx->capture_ctx, ctx->runtime_spad ) );
   return bank;
 }
 
@@ -770,9 +766,7 @@ publish_slot_completed( fd_replay_tile_t *  ctx,
   slot_info->tips                  = 0UL; /* todo ... tip accounts balance delta */
   slot_info->shred_count           = fd_bank_shred_cnt_get( bank );
 
-  fd_cost_tracker_t const * cost_tracker = fd_bank_cost_tracker_locking_query( bank );
-  slot_info->max_compute_units     = !!cost_tracker ? cost_tracker->block_cost_limit : ULONG_MAX;
-  fd_bank_cost_tracker_end_locking_query( bank );
+  slot_info->max_compute_units     = fd_cost_tracker_block_cost_limit( bank );
 
   slot_info->first_fec_set_received_nanos      = bank->first_fec_set_received_nanos;
   slot_info->preparation_begin_nanos           = bank->preparation_begin_nanos;
@@ -940,10 +934,7 @@ prepare_leader_bank( fd_replay_tile_t *  ctx,
       &is_epoch_boundary );
   if( FD_UNLIKELY( is_epoch_boundary ) ) publish_stake_weights( ctx, stem, ctx->leader_bank, 1 );
 
-  int res = fd_runtime_block_execute_prepare( ctx->leader_bank, ctx->funk, &xid, ctx->capture_ctx, ctx->runtime_spad );
-  if( FD_UNLIKELY( res!=FD_RUNTIME_EXECUTE_SUCCESS ) ) {
-    FD_LOG_CRIT(( "block prep execute failed" ));
-  }
+  FD_TEST( !fd_runtime_block_execute_prepare( ctx->leader_bank, ctx->funk, &xid, ctx->capture_ctx, ctx->runtime_spad ) );
 
   /* Now that a bank has been created for the leader slot, increment the
      reference count until we are done with the leader slot. */
@@ -1109,7 +1100,7 @@ init_after_snapshot( fd_replay_tile_t * ctx ) {
       fd_sha256_hash( poh->hash, 32UL, poh->hash );
     }
 
-    FD_TEST( fd_runtime_block_execute_prepare( bank, ctx->funk, &xid, ctx->capture_ctx, ctx->runtime_spad ) == 0 );
+    FD_TEST( !fd_runtime_block_execute_prepare( bank, ctx->funk, &xid, ctx->capture_ctx, ctx->runtime_spad ) );
     fd_runtime_block_execute_finalize( bank, ctx->funk, &xid, ctx->capture_ctx, 1 );
 
     snapshot_slot = 0UL;
@@ -1298,9 +1289,7 @@ boot_genesis( fd_replay_tile_t *  ctx,
   fd_genesis_solana_global_t const * genesis = fd_type_pun( (uchar*)fd_chunk_to_laddr( ctx->in[ in_idx ].mem, chunk )+sizeof(fd_hash_t)+sizeof(fd_lthash_value_t) );
 
   fd_bank_t * bank = fd_banks_bank_query( ctx->banks, FD_REPLAY_BOOT_BANK_IDX );
-  if( FD_UNLIKELY( !bank ) ) {
-    FD_LOG_CRIT(( "invariant violation: bank is NULL for bank index %lu", FD_REPLAY_BOOT_BANK_IDX ));
-  }
+  FD_TEST( bank );
   fd_funk_txn_xid_t xid = { .ul = { 0UL, 0UL } };
 
   fd_runtime_read_genesis( ctx->banks, bank, ctx->funk, &xid, NULL, fd_type_pun_const( genesis_hash ), fd_type_pun_const( lthash ), genesis, ctx->runtime_spad );
@@ -1366,7 +1355,6 @@ boot_genesis( fd_replay_tile_t *  ctx,
   publish_slot_completed( ctx, stem, bank, 1 );
   publish_root_advanced( ctx, stem );
   publish_reset( ctx, stem, bank );
-
 }
 
 static void

src/flamenco/progcache/test_progcache.c

@@ -3,7 +3,9 @@
 
 #include "fd_progcache_admin.h"
 #include "fd_progcache_user.h"
-#include "../runtime/fd_bank.h"
+#include "../runtime/fd_system_ids.h"
+#include "../runtime/fd_txn_account.h"
+#include "../features/fd_features.h"
 
 /* Load in programdata for tests */
 FD_IMPORT_BINARY( valid_program_data,        "src/ballet/sbpf/fixtures/hello_solana_program.so" );

src/flamenco/runtime/fd_bank.c

@@ -242,12 +242,14 @@ fd_banks_new( void * shmem, ulong max_total_banks, ulong max_fork_width ) {
      the offset in the banks. */
 
   fd_bank_cost_tracker_t * cost_tracker_pool = fd_bank_cost_tracker_pool_join( fd_bank_cost_tracker_pool_new( cost_tracker_pool_mem, max_fork_width ) );
-  if( FD_UNLIKELY( !cost_tracker_pool ) ) {
-    FD_LOG_WARNING(( "Failed to new or join cost tracker pool" ));
-    return NULL;
-  }
+  FD_TEST( cost_tracker_pool );
   fd_banks_set_cost_tracker_pool( banks, cost_tracker_pool );
 
+  for( ulong i=0UL; i<max_fork_width; i++ ) {
+    fd_bank_cost_tracker_t * cost_tracker = fd_bank_cost_tracker_pool_ele( cost_tracker_pool, i );
+    fd_cost_tracker_join( fd_cost_tracker_new( cost_tracker->data, 88888UL /* TODO: REAL SEED */ ) );
+  }
+
   /* Now, call _new() and _join() for all of the CoW pools. */
   #define HAS_COW_1_LIMIT_1(name)                                                     \
     fd_rwlock_unwrite( &banks->name##_pool_lock );                                    \

src/flamenco/runtime/fd_bank.h

@@ -594,13 +594,9 @@ FD_BANKS_ITER(X)
 static inline fd_cost_tracker_t *
 fd_bank_cost_tracker_locking_modify( fd_bank_t * bank ) {
   fd_bank_cost_tracker_t * cost_tracker_pool = fd_bank_get_cost_tracker_pool( bank );
-  if( FD_UNLIKELY( bank->cost_tracker_pool_idx==fd_bank_cost_tracker_pool_idx_null( cost_tracker_pool ) ) ) {
-    return NULL;
-  }
+  FD_TEST( bank->cost_tracker_pool_idx!=fd_bank_cost_tracker_pool_idx_null( cost_tracker_pool ) );
   uchar * cost_tracker_mem = fd_bank_cost_tracker_pool_ele( cost_tracker_pool, bank->cost_tracker_pool_idx )->data;
-  if( FD_UNLIKELY( !cost_tracker_mem ) ) {
-    FD_LOG_CRIT(( "invariant violation: cost tracker memory is null" ));
-  }
+  FD_TEST( cost_tracker_mem );
   fd_rwlock_write( &bank->cost_tracker_lock );
   return fd_type_pun( cost_tracker_mem );
 }
@@ -613,13 +609,9 @@ fd_bank_cost_tracker_end_locking_modify( fd_bank_t * bank ) {
 static inline fd_cost_tracker_t const *
 fd_bank_cost_tracker_locking_query( fd_bank_t * bank ) {
   fd_bank_cost_tracker_t * cost_tracker_pool = fd_bank_get_cost_tracker_pool( bank );
-  if( FD_UNLIKELY( bank->cost_tracker_pool_idx==fd_bank_cost_tracker_pool_idx_null( cost_tracker_pool ) ) ) {
-    return NULL;
-  }
+  FD_TEST( bank->cost_tracker_pool_idx!=fd_bank_cost_tracker_pool_idx_null( cost_tracker_pool ) );
   uchar * cost_tracker_mem = fd_bank_cost_tracker_pool_ele( cost_tracker_pool, bank->cost_tracker_pool_idx )->data;
-  if( FD_UNLIKELY( !cost_tracker_mem ) ) {
-    FD_LOG_CRIT(( "invariant violation: cost tracker memory is null" ));
-  }
+  FD_TEST( cost_tracker_mem );
   fd_rwlock_read( &bank->cost_tracker_lock );
   return fd_type_pun_const( cost_tracker_mem );
 }

src/flamenco/runtime/fd_core_bpf_migration.c

@@ -2,6 +2,7 @@
 #include "program/fd_bpf_loader_program.h"
 #include "program/fd_builtin_programs.h"
 #include "fd_pubkey_utils.h"
+#include "fd_system_ids.h"
 
 /* Mimics bank.new_target_program_account(). Assumes out_rec is a
    modifiable record.