fluencelabs/marine-rs-sdk
1
0
Fork 0
mirror of https://github.com/fluencelabs/marine-rs-sdk synced 2025-03-15 14:30:48 +00:00
Code Issues Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
vms 2020-10-06 12:32:15 +03:00
parent ab438b33d0
commit c53f03ad06
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crates/main/src/lib.rs
View File

@ -53,13 +53,8 @@ pub use result::set_result_size;
pub(crate) fn log<S: AsRef<str>>(msg: S) { pub(crate) fn log<S: AsRef<str>>(msg: S) {
// logs will be printed only if debug feature is enabled // logs will be printed only if debug feature is enabled
#[cfg(feature = "debug")] #[cfg(feature = "debug")]
unsafe { {
let msg = msg.as_ref(); let msg = msg.as_ref();
logger::log_utf8_string(msg.as_ptr() as i32, msg.len() as i32);
if cfg!(target_arch = "wasm32") {
logger::log_utf8_string(msg.as_ptr() as i32, msg.len() as i32);
} else {
println!("{}", msg);
}
} }
} }

21
crates/main/src/logger.rs
View File

@ -144,12 +144,7 @@ impl log::Log for WasmLogger {
record.args() record.args()
); );
// this allows building sdk for x86_64 log_utf8_string(log_msg.as_ptr() as _, log_msg.len() as _);
if cfg!(target_arch = "wasm32") {
unsafe { log_utf8_string(log_msg.as_ptr() as i32, log_msg.len() as i32) };
} else {
println!("{}", log_msg);
}
} }
// in our case flushing is performed by the VM itself // in our case flushing is performed by the VM itself
@ -157,10 +152,22 @@ impl log::Log for WasmLogger {
fn flush(&self) {} fn flush(&self) {}
} }
#[cfg(target_arch = "wasm32")]
pub fn log_utf8_string(ptr: i32, size: i32) {
unsafe { log_utf8_string_impl(ptr, size) };
}
#[cfg(not(target_arch = "wasm32"))]
pub fn log_utf8_string(ptr: i32, size: i32) {
let msg = unsafe { from_utf8_unchecked(core::slice::from_raw_parts(ptr as _, size as _)) };
println!("{}", msg);
}
/// log_utf8_string should be provided directly by a host. /// log_utf8_string should be provided directly by a host.
#[cfg(target_arch = "wasm32")] #[cfg(target_arch = "wasm32")]
#[link(wasm_import_module = "host")] #[link(wasm_import_module = "host")]
extern "C" { extern "C" {
// Writes a byte string of size bytes that starts from ptr to a logger // Writes a byte string of size bytes that starts from ptr to a logger
pub fn log_utf8_string(ptr: i32, size: i32); #[link_name = "log_utf8_string"]
fn log_utf8_string_impl(ptr: i32, size: i32);
} }