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

BPF loader message nits (#5870)

Browse Source
This commit is contained in:
Jack May
2019-09-10 16:13:23 -07:00
committed by GitHub
parent ee4266bc59
commit 008dcd71b9
9 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
programs/bpf_loader_api/src/helpers.rs
View File

@@ -109,7 +109,7 @@ pub fn helper_sol_log(
if i == len - 1 || c == 0 {
let message =
from_utf8(from_raw_parts(host_addr as *const u8, len as usize)).unwrap();
println!("info!: {}", message);
info!("info!: {}", message);
return Ok(0);
}
}

9
programs/bpf_loader_api/src/lib.rs
View File

@@ -97,7 +97,7 @@ pub fn process_instruction(
}
let offset = offset as usize;
let len = bytes.len();
debug!("Write: offset={} length={}", offset, len);
trace!("Write: offset={} length={}", offset, len);
if keyed_accounts[0].account.data.len() < offset + len {
warn!(
"Write overflow: {} < {}",
@@ -126,7 +126,6 @@ pub fn process_instruction(
}
let (progs, params) = keyed_accounts.split_at_mut(1);
let prog = &progs[0].account.data;
info!("Call BPF program");
let (mut vm, heap_region) = match create_vm(prog) {
Ok(info) => info,
Err(e) => {
@@ -136,6 +135,7 @@ pub fn process_instruction(
};
let mut v = serialize_parameters(program_id, params, &data);
info!("Call BPF program");
match vm.execute_program(v.as_mut_slice(), &[], &[heap_region]) {
Ok(status) => match u32::try_from(status) {
Ok(status) => {
@@ -155,10 +155,7 @@ pub fn process_instruction(
}
}
deserialize_parameters(params, &v);
info!(
"BPF program executed {} instructions",
vm.get_last_instruction_count()
);
info!("BPF program success");
}
}
} else {