maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/eval): condense observer's stack writing logic

Browse source 
Change-Id: I1282c3387ac1e0d1528b894814f2a495ca5a6a32
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8199
Tested-by: BuildkiteCI
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
This commit is contained in:
Vincent Ambo 2023-03-03 21:23:12 +03:00 • committed by tazjin
parent eef48b8f1f
commit fb4ea1f5a4
1 changed files with 24 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

77
tvix/eval/src/observer.rs
View file

@ -149,6 +149,16 @@ impl<W: Write> TracingObserver<W> {
writer: TabWriter::new(writer), writer: TabWriter::new(writer),
} }
} }
fn write_stack(&mut self, stack: &[Value]) {
let _ = write!(&mut self.writer, "[ ");
for val in stack {
let _ = write!(&mut self.writer, "{} ", val);
}
let _ = writeln!(&mut self.writer, "]");
}
} }
impl<W: Write> RuntimeObserver for TracingObserver<W> { impl<W: Write> RuntimeObserver for TracingObserver<W> {
@ -179,69 +189,40 @@ impl<W: Write> RuntimeObserver for TracingObserver<W> {
/// Called when the runtime exits a call frame. /// Called when the runtime exits a call frame.
fn observe_exit_call_frame(&mut self, frame_at: usize, stack: &[Value]) { fn observe_exit_call_frame(&mut self, frame_at: usize, stack: &[Value]) {
let _ = write!(&mut self.writer, "=== exiting frame {} ===\t[ ", frame_at); let _ = write!(&mut self.writer, "=== exiting frame {} ===\t ", frame_at);
self.write_stack(stack);
for val in stack {
let _ = write!(&mut self.writer, "{} ", val);
}
let _ = writeln!(&mut self.writer, "]");
} }
fn observe_suspend_call_frame(&mut self, frame_at: usize, stack: &[Value]) { fn observe_suspend_call_frame(&mut self, frame_at: usize, stack: &[Value]) {
let _ = write!( let _ = write!(&mut self.writer, "=== suspending frame {} ===\t", frame_at);
&mut self.writer,
"=== suspending frame {} ===\t[ ",
frame_at
);
for val in stack { self.write_stack(stack);
let _ = write!(&mut self.writer, "{} ", val);
}
let _ = writeln!(&mut self.writer, "]");
} }
fn observe_enter_generator(&mut self, frame_at: usize, stack: &[Value]) { fn observe_enter_generator(&mut self, frame_at: usize, stack: &[Value]) {
let _ = write!( let _ = write!(
&mut self.writer, &mut self.writer,
"=== entering generator frame {} ===\t[ ", "=== entering generator frame {} ===\t",
frame_at frame_at
); );
for val in stack { self.write_stack(stack);
let _ = write!(&mut self.writer, "{} ", val);
}
let _ = writeln!(&mut self.writer, "]");
} }
fn observe_exit_generator(&mut self, frame_at: usize, stack: &[Value]) { fn observe_exit_generator(&mut self, frame_at: usize, stack: &[Value]) {
let _ = write!( let _ = write!(&mut self.writer, "=== exiting generator {} ===\t", frame_at);
&mut self.writer,
"=== exiting generator {} ===\t[ ",
frame_at
);
for val in stack { self.write_stack(stack);
let _ = write!(&mut self.writer, "{} ", val);
}
let _ = writeln!(&mut self.writer, "]");
} }
fn observe_suspend_generator(&mut self, frame_at: usize, stack: &[Value]) { fn observe_suspend_generator(&mut self, frame_at: usize, stack: &[Value]) {
let _ = write!( let _ = write!(
&mut self.writer, &mut self.writer,
"=== suspending generator {} ===\t[ ", "=== suspending generator {} ===\t",
frame_at frame_at
); );
for val in stack { self.write_stack(stack);
let _ = write!(&mut self.writer, "{} ", val);
}
let _ = writeln!(&mut self.writer, "]");
} }
fn observe_generator_request(&mut self, msg: &GeneratorRequest) { fn observe_generator_request(&mut self, msg: &GeneratorRequest) {
@ -253,13 +234,8 @@ impl<W: Write> RuntimeObserver for TracingObserver<W> {
} }
fn observe_exit_builtin(&mut self, name: &'static str, stack: &[Value]) { fn observe_exit_builtin(&mut self, name: &'static str, stack: &[Value]) {
let _ = write!(&mut self.writer, "=== exiting builtin {} ===\t[ ", name); let _ = write!(&mut self.writer, "=== exiting builtin {} ===\t", name);
self.write_stack(stack);
for val in stack {
let _ = write!(&mut self.writer, "{} ", val);
}
let _ = writeln!(&mut self.writer, "]");
} }
fn observe_tail_call(&mut self, frame_at: usize, lambda: &Rc<Lambda>) { fn observe_tail_call(&mut self, frame_at: usize, lambda: &Rc<Lambda>) {
@ -271,13 +247,8 @@ impl<W: Write> RuntimeObserver for TracingObserver<W> {
} }
fn observe_execute_op(&mut self, ip: CodeIdx, op: &OpCode, stack: &[Value]) { fn observe_execute_op(&mut self, ip: CodeIdx, op: &OpCode, stack: &[Value]) {
let _ = write!(&mut self.writer, "{:04} {:?}\t[ ", ip.0, op); let _ = write!(&mut self.writer, "{:04} {:?}\t", ip.0, op);
self.write_stack(stack);
for val in stack {
let _ = write!(&mut self.writer, "{} ", val);
}
let _ = writeln!(&mut self.writer, "]");
} }
} }