From 19106cdaf09db818b56f9887c92fcf68ac2ec361 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Fri, 3 Mar 2023 21:42:12 +0300 Subject: fix(tvix/eval): don't print full values in observer This can actually blow up when tracing arbitrary execution, as some of the data structures just get too large to run through a tabwriter. Change-Id: I6ec4c30ee48655b8a62954ca219107404fb2c256 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8200 Tested-by: BuildkiteCI Reviewed-by: raitobezarius --- tvix/eval/src/observer.rs | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'tvix/eval') diff --git a/tvix/eval/src/observer.rs b/tvix/eval/src/observer.rs index b26d0ff9e352..970a644a3d43 100644 --- a/tvix/eval/src/observer.rs +++ b/tvix/eval/src/observer.rs @@ -150,11 +150,24 @@ impl TracingObserver { } } + fn write_value(&mut self, val: &Value) { + let _ = match val { + // Potentially large types which we only want to print + // the type of (and avoid recursing). + Value::List(l) => write!(&mut self.writer, "list[{}] ", l.len()), + Value::Attrs(a) => write!(&mut self.writer, "attrs[{}] ", a.len()), + Value::Thunk(t) if t.is_evaluated() => Ok(self.write_value(&t.value())), + + // For other value types, defer to the standard value printer. + _ => write!(&mut self.writer, "{} ", val), + }; + } + fn write_stack(&mut self, stack: &[Value]) { let _ = write!(&mut self.writer, "[ "); for val in stack { - let _ = write!(&mut self.writer, "{} ", val); + self.write_value(&val); } let _ = writeln!(&mut self.writer, "]"); -- cgit 1.4.1