feat(diagnostics): preserve Registry and resource fault context for PLN-0176 step 28
This commit is contained in:
@@ -379,6 +379,10 @@ impl HostDebugger {
|
||||
CrashReport::VmTrap { trap } => (Some(trap.code), Some(trap.opcode)),
|
||||
CrashReport::VmPanic { .. } | CrashReport::VmInit { .. } => (None, None),
|
||||
};
|
||||
let span = match report {
|
||||
CrashReport::VmTrap { trap } => trap.span.clone(),
|
||||
_ => None,
|
||||
};
|
||||
|
||||
self.send_event(DebugEvent::Fault {
|
||||
kind: report.kind().to_string(),
|
||||
@@ -386,6 +390,9 @@ impl HostDebugger {
|
||||
pc: report.pc(),
|
||||
trap_code,
|
||||
opcode,
|
||||
span,
|
||||
resource: report.resource_failure(),
|
||||
init: report.init_diagnostic(),
|
||||
});
|
||||
self.last_fault_summary = Some(summary);
|
||||
}
|
||||
|
||||
@@ -2,10 +2,11 @@ use base64::{Engine as _, engine::general_purpose::STANDARD};
|
||||
use prometeu_bytecode::Value as VmValue;
|
||||
use prometeu_hal::InputSignals;
|
||||
use prometeu_system::CrashReport;
|
||||
use prometeu_vm::VmInitError;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use serde_json::{Value, json};
|
||||
use std::io;
|
||||
#[cfg(test)]
|
||||
mod fault_tests;
|
||||
|
||||
use crate::{CapturedFrame, HostError, HostExecutionStatus, HostState};
|
||||
|
||||
@@ -282,24 +283,13 @@ pub(super) fn fault(report: &CrashReport) -> Value {
|
||||
match report {
|
||||
CrashReport::VmTrap { trap } => {
|
||||
result["trap"] = json!({"code":trap.code,"opcode":trap.opcode,
|
||||
"message":trap.message,"pc":trap.pc,"span":trap.span});
|
||||
"message":trap.message,"pc":trap.pc,"span":trap.span,"resource":trap.resource});
|
||||
}
|
||||
CrashReport::VmPanic { message, .. } => {
|
||||
result["message"] = json!(message);
|
||||
}
|
||||
CrashReport::VmInit { error } => {
|
||||
let code = match error {
|
||||
VmInitError::RegistryLoadFailed(_) => "registry_load_failed",
|
||||
VmInitError::RuntimeResourceLimit(_) => "runtime_resource_limit",
|
||||
VmInitError::InvalidFormat => "invalid_format",
|
||||
VmInitError::UnsupportedFormat => "unsupported_format",
|
||||
VmInitError::ImageLoadFailed(_) => "image_load_failed",
|
||||
VmInitError::LoaderPatchFailed(_) => "loader_patch_failed",
|
||||
VmInitError::EntrypointNotFound => "entrypoint_not_found",
|
||||
VmInitError::EntrypointArgumentsInvalid { .. } => "entrypoint_arguments_invalid",
|
||||
VmInitError::VerificationFailed(_) => "verification_failed",
|
||||
};
|
||||
result["initError"] = json!({"code":code,"message":format!("{error:?}")});
|
||||
CrashReport::VmInit { .. } => {
|
||||
result["initError"] = report.init_diagnostic().expect("initialization report");
|
||||
}
|
||||
}
|
||||
result
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
use super::*;
|
||||
use prometeu_bytecode::{
|
||||
ResourceFailure, ResourceReason, RuntimeResource, SourceSpan, TRAP_RESOURCE_LIMIT, TrapInfo,
|
||||
};
|
||||
|
||||
#[test]
|
||||
fn resource_trap_wire_preserves_native_fields_and_source_span() {
|
||||
let report = CrashReport::VmTrap {
|
||||
trap: TrapInfo {
|
||||
code: TRAP_RESOURCE_LIMIT,
|
||||
opcode: 0x90,
|
||||
pc: 18,
|
||||
message: "localized human wording".into(),
|
||||
span: Some(SourceSpan { file_id: 7, start: 4, end: 9 }),
|
||||
resource: Some(ResourceFailure {
|
||||
resource: RuntimeResource::HandleSlots,
|
||||
reason: ResourceReason::Limit,
|
||||
requested: 3,
|
||||
limit: 2,
|
||||
}),
|
||||
},
|
||||
};
|
||||
let wire = fault(&report);
|
||||
assert_eq!(wire["trap"]["code"], 0x10);
|
||||
assert_eq!(wire["trap"]["opcode"], 0x90);
|
||||
assert_eq!(wire["trap"]["pc"], 18);
|
||||
assert_eq!(wire["trap"]["span"]["file_id"], 7);
|
||||
assert_eq!(wire["trap"]["resource"]["resource"], "HandleSlots");
|
||||
assert_eq!(wire["trap"]["resource"]["requested"], 3);
|
||||
assert_eq!(wire["trap"]["resource"]["limit"], 2);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn load_failure_wire_uses_shared_structured_serializer_and_no_runtime_pc() {
|
||||
use prometeu_bytecode::load_limits::{LoadCode, LoadFailure, LoadReason, LoadResource};
|
||||
let mut error = LoadFailure::resource(LoadResource::Work, 23, 22).in_function(1, Some(6));
|
||||
error.code = LoadCode::ResourceLimit;
|
||||
error.reason = LoadReason::Limit;
|
||||
let report = CrashReport::VmInit { error: prometeu_vm::VmInitError::RegistryLoadFailed(error) };
|
||||
let wire = fault(&report);
|
||||
assert_eq!(wire["pc"], Value::Null);
|
||||
assert_eq!(wire["initError"], report.init_diagnostic().unwrap());
|
||||
assert_eq!(wire["initError"]["load"]["code"], "LOAD_RESOURCE_LIMIT");
|
||||
assert_eq!(wire["initError"]["load"]["resource"], "Work");
|
||||
assert_eq!(wire["initError"]["load"]["requested"], 23);
|
||||
assert_eq!(wire["initError"]["load"]["limit"], 22);
|
||||
}
|
||||
Reference in New Issue
Block a user