pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-26 07:37:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

sc-executor: Improve logging (#10869)

Browse Source 
Improves the logging by switching to `tracing` for a better log output. Besides that, it also adds a
trace for the function being executed.
This commit is contained in:
Bastian Köcher
2022-02-16 20:39:22 +01:00
committed by GitHub
parent ba8c882a7a
commit 1a61cd40fa
4 changed files with 45 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/executor/src/native_executor.rs
+34 -24
View File
@@ -35,7 +35,6 @@ use std::{
};
use codec::{Decode, Encode};
use log::trace;
use sc_executor_common::{
runtime_blob::RuntimeBlob,
wasm_runtime::{InvokeMethod, WasmInstance, WasmModule},
@@ -301,6 +300,12 @@ where
_use_native: bool,
_native_call: Option<NC>,
) -> (Result<NativeOrEncoded<R>>, bool) {
tracing::trace!(
target: "executor",
%method,
"Executing function",
);
let result = self.with_instance(
runtime_code,
ext,
@@ -422,10 +427,10 @@ impl RuntimeSpawn for RuntimeInstanceSpawn {
let async_ext = match new_async_externalities(scheduler.clone()) {
Ok(val) => val,
Err(e) => {
log::error!(
tracing::error!(
target: "executor",
"Failed to setup externalities for async context: {}",
e,
error = %e,
"Failed to setup externalities for async context.",
);
// This will drop sender and receiver end will panic
@@ -438,10 +443,10 @@ impl RuntimeSpawn for RuntimeInstanceSpawn {
)) {
Ok(val) => val,
Err(e) => {
log::error!(
tracing::error!(
target: "executor",
"Failed to setup runtime extension for async externalities: {}",
e,
error = %e,
"Failed to setup runtime extension for async externalities",
);
// This will drop sender and receiver end will panic
@@ -476,7 +481,7 @@ impl RuntimeSpawn for RuntimeInstanceSpawn {
Err(error) => {
// If execution is panicked, the `join` in the original runtime code will
// panic as well, since the sender is dropped without sending anything.
log::error!("Call error in spawned task: {}", error);
tracing::error!(error = %error, "Call error in spawned task");
},
}
}),
@@ -518,10 +523,10 @@ fn preregister_builtin_ext(module: Arc<dyn WasmModule>) {
RuntimeInstanceSpawn::with_externalities_and_module(module, ext)
{
if let Err(e) = ext.register_extension(RuntimeSpawnExt(Box::new(runtime_spawn))) {
trace!(
tracing::trace!(
target: "executor",
"Failed to register `RuntimeSpawnExt` instance on externalities: {:?}",
e,
error = ?e,
"Failed to register `RuntimeSpawnExt` instance on externalities",
)
}
}
@@ -543,6 +548,12 @@ impl<D: NativeExecutionDispatch + 'static> CodeExecutor for NativeElseWasmExecut
use_native: bool,
native_call: Option<NC>,
) -> (Result<NativeOrEncoded<R>>, bool) {
tracing::trace!(
target: "executor",
function = %method,
"Executing function",
);
let mut used_native = false;
let result = self.wasm.with_instance(
runtime_code,
@@ -558,11 +569,11 @@ impl<D: NativeExecutionDispatch + 'static> CodeExecutor for NativeElseWasmExecut
match (use_native, can_call_with, native_call) {
(_, false, _) | (false, _, _) => {
if !can_call_with {
trace!(
tracing::trace!(
target: "executor",
"Request for native execution failed (native: {}, chain: {})",
self.native_version.runtime_version,
onchain_version,
native = %self.native_version.runtime_version,
chain = %onchain_version,
"Request for native execution failed",
);
}
@@ -572,12 +583,11 @@ impl<D: NativeExecutionDispatch + 'static> CodeExecutor for NativeElseWasmExecut
})
},
(true, true, Some(call)) => {
trace!(
tracing::trace!(
target: "executor",
"Request for native execution with native call succeeded \
(native: {}, chain: {}).",
self.native_version.runtime_version,
onchain_version,
native = %self.native_version.runtime_version,
chain = %onchain_version,
"Request for native execution with native call succeeded"
);
used_native = true;
@@ -587,11 +597,11 @@ impl<D: NativeExecutionDispatch + 'static> CodeExecutor for NativeElseWasmExecut
Ok(res)
},
_ => {
trace!(
tracing::trace!(
target: "executor",
"Request for native execution succeeded (native: {}, chain: {})",
self.native_version.runtime_version,
onchain_version
native = %self.native_version.runtime_version,
chain = %onchain_version,
"Request for native execution succeeded",
);
used_native = true;
substrate/client/executor/src/wasm_runtime.rs
+10 -10
View File
@@ -103,23 +103,23 @@ impl VersionedRuntime {
let result = f(&self.module, &mut *instance, self.version.as_ref(), ext);
if let Err(e) = &result {
if new_inst {
log::warn!(
tracing::warn!(
target: "wasm-runtime",
"Fresh runtime instance failed with {}",
e,
error = %e,
"Fresh runtime instance failed",
)
} else {
log::warn!(
tracing::warn!(
target: "wasm-runtime",
"Evicting failed runtime instance: {}",
e,
error = %e,
"Evicting failed runtime instance",
);
}
} else {
*locked = Some(instance);
if new_inst {
log::debug!(
tracing::debug!(
target: "wasm-runtime",
"Allocated WASM instance {}/{}",
index + 1,
@@ -131,7 +131,7 @@ impl VersionedRuntime {
result
},
None => {
log::warn!(target: "wasm-runtime", "Ran out of free WASM instances");
tracing::warn!(target: "wasm-runtime", "Ran out of free WASM instances");
// Allocate a new instance
let mut instance = self.module.new_instance()?;
@@ -259,7 +259,7 @@ impl RuntimeCache {
match result {
Ok(ref result) => {
log::debug!(
tracing::debug!(
target: "wasm-runtime",
"Prepared new runtime version {:?} in {} ms.",
result.version,
@@ -267,7 +267,7 @@ impl RuntimeCache {
);
},
Err(ref err) => {
log::warn!(target: "wasm-runtime", "Cannot create a runtime: {:?}", err);
tracing::warn!(target: "wasm-runtime", error = ?err, "Cannot create a runtime");
},
}