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

Optimize BPF logs (#6186)

Browse Source
This commit is contained in:
Jack May
2019-09-30 14:21:29 -07:00
committed by GitHub
parent 97752b4937
commit 520f7c3e18
15 changed files with 46 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
programs/bpf_loader_api/Cargo.toml
View File

@@ -16,7 +16,7 @@ log = "0.4.8"
serde = "1.0.101"
solana-logger = { path = "../../logger", version = "0.20.0" }
solana-sdk = { path = "../../sdk", version = "0.20.0" }
solana_rbpf = "=0.1.18"
solana_rbpf = "=0.1.19"
[lib]
crate-type = ["lib"]

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

@@ -101,23 +101,27 @@ pub fn helper_sol_log(
ro_regions: &[MemoryRegion],
_rw_regions: &[MemoryRegion],
) -> Result<(u64), Error> {
let host_addr = translate_addr(addr, len as usize, "Load", 0, ro_regions)?;
let c_buf: *const c_char = host_addr as *const c_char;
unsafe {
for i in 0..len {
let c = std::ptr::read(c_buf.offset(i as isize));
if i == len - 1 || c == 0 {
let message =
from_utf8(from_raw_parts(host_addr as *const u8, len as usize)).unwrap();
info!("info!: {}", message);
return Ok(0);
if log_enabled!(log::Level::Info) {
let host_addr = translate_addr(addr, len as usize, "Load", 0, ro_regions)?;
let c_buf: *const c_char = host_addr as *const c_char;
unsafe {
for i in 0..len {
let c = std::ptr::read(c_buf.offset(i as isize));
if i == len - 1 || c == 0 {
let message =
from_utf8(from_raw_parts(host_addr as *const u8, len as usize)).unwrap();
info!("info!: {}", message);
return Ok(0);
}
}
}
Err(Error::new(
ErrorKind::Other,
"Error: Unterminated string logged",
))
} else {
Ok(0)
}
Err(Error::new(
ErrorKind::Other,
"Error: Unterminated string logged",
))
}
pub fn helper_sol_log_u64(
@@ -130,10 +134,12 @@ pub fn helper_sol_log_u64(
_ro_regions: &[MemoryRegion],
_rw_regions: &[MemoryRegion],
) -> Result<(u64), Error> {
info!(
"info!: {:#x}, {:#x}, {:#x}, {:#x}, {:#x}",
arg1, arg2, arg3, arg4, arg5
);
if log_enabled!(log::Level::Info) {
info!(
"info!: {:#x}, {:#x}, {:#x}, {:#x}, {:#x}",
arg1, arg2, arg3, arg4, arg5
);
}
Ok(0)
}