urbit/ares
1
1
Fork 0
mirror of https://github.com/urbit/ares.git synced 2024-11-29 22:56:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

trace: add profile trace to DONE block

Browse Source 
It's possible for a tail-recursive 9 to never hit the RET block.
This commit is contained in:
Alex Shelkovnykov 2023-11-17 12:41:34 +01:00
parent 9573584979
commit f5889bba17
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
rust/ares/src/interpreter.rs
View File

@ -334,8 +334,9 @@ pub fn interpret(context: &mut Context, mut subject: Noun, formula: Noun) -> Res
let work: NockWork = *context.stack.top(); let work: NockWork = *context.stack.top();
match work { match work {
NockWork::Done => { NockWork::Done => {
let stack = &mut context.stack; write_trace(context);
let stack = &mut context.stack;
debug_assertions(stack, orig_subject); debug_assertions(stack, orig_subject);
debug_assertions(stack, subject); debug_assertions(stack, subject);
debug_assertions(stack, res); debug_assertions(stack, res);
@ -352,23 +353,13 @@ pub fn interpret(context: &mut Context, mut subject: Noun, formula: Noun) -> Res
break Ok(res); break Ok(res);
} }
NockWork::Ret => { NockWork::Ret => {
let stack = &mut context.stack; write_trace(context);
let stack = &mut context.stack;
debug_assertions(stack, orig_subject); debug_assertions(stack, orig_subject);
debug_assertions(stack, subject); debug_assertions(stack, subject);
debug_assertions(stack, res); debug_assertions(stack, res);
// Write fast-hinted traces to trace file
if let Some(ref mut info) = &mut context.trace_info {
let trace_stack = *(stack.local_noun_pointer(1) as *mut *const TraceStack);
// Abort writing to trace file if we encountered an error. This should
// result in a well-formed partial trace file.
if let Err(e) = write_nock_trace(stack, info, trace_stack) {
eprintln!("\rError writing trace to file: {:?}", e);
context.trace_info = None;
}
}
stack.preserve(&mut context.cache); stack.preserve(&mut context.cache);
stack.preserve(&mut context.cold); stack.preserve(&mut context.cold);
stack.preserve(&mut context.warm); stack.preserve(&mut context.warm);
@ -1248,6 +1239,19 @@ fn append_trace(stack: &mut NockStack, path: Noun) {
} }
} }
/// Write fast-hinted traces to trace file
unsafe fn write_trace(context: &mut Context) {
if let Some(ref mut info) = &mut context.trace_info {
let trace_stack = *(context.stack.local_noun_pointer(1) as *mut *const TraceStack);
// Abort writing to trace file if we encountered an error. This should
// result in a well-formed partial trace file.
if let Err(e) = write_nock_trace(&mut context.stack, info, trace_stack) {
eprintln!("\rError writing trace to file: {:?}", e);
context.trace_info = None;
}
}
}
mod hint { mod hint {
use super::*; use super::*;
use crate::jets; use crate::jets;