gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Default to the BPF JIT. Use the solana-validator --no-bpf-jit flag to disable

Browse Source
This commit is contained in:
Michael Vines
2021-03-09 16:23:08 -08:00
parent ab21171e2a
commit c836cd85c3
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ledger-tool/src/main.rs
View File

@ -746,10 +746,10 @@ fn main() {
.long("no-snapshot") .long("no-snapshot")
.takes_value(false) .takes_value(false)
.help("Do not start from a local snapshot if present"); .help("Do not start from a local snapshot if present");
let bpf_jit_arg = Arg::with_name("bpf_jit") let no_bpf_jit_arg = Arg::with_name("no_bpf_jit")
.long("bpf-jit") .long("no-bpf-jit")
.takes_value(false) .takes_value(false)
.help("Process with JIT instead of interpreter"); .help("Disable the just-in-time compiler and instead use the interpreter for BP");
let no_accounts_db_caching_arg = Arg::with_name("no_accounts_db_caching") let no_accounts_db_caching_arg = Arg::with_name("no_accounts_db_caching")
.long("no-accounts-db-caching") .long("no-accounts-db-caching")
.takes_value(false) .takes_value(false)
@ -1019,7 +1019,7 @@ fn main() {
.arg(&halt_at_slot_arg) .arg(&halt_at_slot_arg)
.arg(&hard_forks_arg) .arg(&hard_forks_arg)
.arg(&no_accounts_db_caching_arg) .arg(&no_accounts_db_caching_arg)
.arg(&bpf_jit_arg) .arg(&no_bpf_jit_arg)
.arg(&allow_dead_slots_arg) .arg(&allow_dead_slots_arg)
.arg(&max_genesis_archive_unpacked_size_arg) .arg(&max_genesis_archive_unpacked_size_arg)
.arg( .arg(
@ -1684,7 +1684,7 @@ fn main() {
dev_halt_at_slot: value_t!(arg_matches, "halt_at_slot", Slot).ok(), dev_halt_at_slot: value_t!(arg_matches, "halt_at_slot", Slot).ok(),
new_hard_forks: hardforks_of(arg_matches, "hard_forks"), new_hard_forks: hardforks_of(arg_matches, "hard_forks"),
poh_verify: !arg_matches.is_present("skip_poh_verify"), poh_verify: !arg_matches.is_present("skip_poh_verify"),
bpf_jit: arg_matches.is_present("bpf_jit"), bpf_jit: !matches.is_present("no_bpf_jit"),
accounts_db_caching_enabled: !arg_matches.is_present("no_accounts_db_caching"), accounts_db_caching_enabled: !arg_matches.is_present("no_accounts_db_caching"),
allow_dead_slots: arg_matches.is_present("allow_dead_slots"), allow_dead_slots: arg_matches.is_present("allow_dead_slots"),
..ProcessOptions::default() ..ProcessOptions::default()

12
validator/src/main.rs
View File

@ -1581,10 +1581,18 @@ pub fn main() {
), ),
) )
.arg( .arg(
Arg::with_name("no_bpf_jit")
.long("no-bpf-jit")
.takes_value(false)
.help("Disable the just-in-time compiler and instead use the interpreter for BPF"),
)
.arg(
// legacy nop argument
Arg::with_name("bpf_jit") Arg::with_name("bpf_jit")
.long("bpf-jit") .long("bpf-jit")
.hidden(true)
.takes_value(false) .takes_value(false)
.help("Use the just-in-time compiler instead of the interpreter for BPF."), .conflicts_with("no_bpf_jit")
) )
.arg( .arg(
Arg::with_name("poh_pinned_cpu_core") Arg::with_name("poh_pinned_cpu_core")
@ -1920,7 +1928,7 @@ pub fn main() {
poh_verify: !matches.is_present("skip_poh_verify"), poh_verify: !matches.is_present("skip_poh_verify"),
debug_keys, debug_keys,
contact_debug_interval, contact_debug_interval,
bpf_jit: matches.is_present("bpf_jit"), bpf_jit: !matches.is_present("no_bpf_jit"),
send_transaction_retry_ms: value_t_or_exit!(matches, "rpc_send_transaction_retry_ms", u64), send_transaction_retry_ms: value_t_or_exit!(matches, "rpc_send_transaction_retry_ms", u64),
send_transaction_leader_forward_count: value_t_or_exit!( send_transaction_leader_forward_count: value_t_or_exit!(
matches, matches,