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

trace: disable tracing on failed write to file

Browse Source
This commit is contained in:
Alex Shelkovnykov 2023-11-17 11:20:44 +01:00
parent e1c5d158e6
commit 9573584979
3 changed files with 63 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -361,7 +361,12 @@ pub fn interpret(context: &mut Context, mut subject: Noun, formula: Noun) -> 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);
write_nock_trace(stack, info, trace_stack);
// 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);

5
rust/ares/src/serf.rs
View File

@ -208,7 +208,10 @@ pub fn serf() -> io::Result<()> {
};
if let Some(ref mut info) = trace_info.as_mut() {
write_metadata(info);
if let Err(e) = write_metadata(info) {
eprintln!("\rError initializing trace file: {:?}", e);
trace_info = None;
}
}
let mut context = Context::new(&snap_path, trace_info);

55
rust/ares/src/trace.rs
View File

@ -59,8 +59,8 @@ pub fn create_trace_file(pier_path: PathBuf) -> Result<TraceInfo, Error> {
}
/// Write metadata to trace file
pub fn write_metadata(info: &mut TraceInfo) {
info.file.write_all("[ ".as_bytes());
pub fn write_metadata(info: &mut TraceInfo) -> Result<(), Error> {
info.file.write_all("[ ".as_bytes())?;
(object! {
name: "process_name",
@ -68,8 +68,8 @@ pub fn write_metadata(info: &mut TraceInfo) {
pid: info.pid,
args: object! { name: "urbit", },
})
.write(&mut info.file);
info.file.write_all(",\n".as_bytes());
.write(&mut info.file)?;
info.file.write_all(",\n".as_bytes())?;
(object! {
name: "thread_name",
@ -78,8 +78,8 @@ pub fn write_metadata(info: &mut TraceInfo) {
tid: 1,
args: object!{ name: "Event Processing", },
})
.write(&mut info.file);
info.file.write_all(",\n".as_bytes());
.write(&mut info.file)?;
info.file.write_all(",\n".as_bytes())?;
(object! {
name: "thread_sort_index",
@ -88,8 +88,8 @@ pub fn write_metadata(info: &mut TraceInfo) {
tid: 1,
args: object!{ sort_index: 1, },
})
.write(&mut info.file);
info.file.write_all(",\n".as_bytes());
.write(&mut info.file)?;
info.file.write_all(",\n".as_bytes())?;
(object! {
name: "thread_name",
@ -98,8 +98,8 @@ pub fn write_metadata(info: &mut TraceInfo) {
tid: 2,
args: object!{ name: "Nock", },
})
.write(&mut info.file);
info.file.write_all(",\n".as_bytes());
.write(&mut info.file)?;
info.file.write_all(",\n".as_bytes())?;
(object! {
name: "thread_sort_index",
@ -108,20 +108,20 @@ pub fn write_metadata(info: &mut TraceInfo) {
tid: 2,
args: object!{ sort_index: 2, },
})
.write(&mut info.file);
info.file.write_all(",\n".as_bytes());
.write(&mut info.file)?;
info.file.write_all(",\n".as_bytes())?;
info.file.sync_data();
info.file.sync_data()?;
Ok(())
}
pub fn write_nock_trace(
pub unsafe fn write_nock_trace(
stack: &mut NockStack,
info: &mut TraceInfo,
mut trace_stack: *const TraceStack,
) {
) -> Result<(), Error> {
let now = Instant::now();
unsafe {
assert_no_alloc::permit_alloc(|| {
while !trace_stack.is_null() {
let ts = (*trace_stack)
.start
@ -142,6 +142,7 @@ pub fn write_nock_trace(
let pclen = met3_usize(pc);
let pc_str = &pc.as_bytes()[0..pclen];
assert_no_alloc::permit_alloc(|| {
let obj = object! {
cat: "nock",
name: pc_str,
@ -151,23 +152,15 @@ pub fn write_nock_trace(
ts: ts,
dur: dur,
};
if let Err(e) = obj.write(&mut info.file) {
eprintln!("\rError writing trace to file: {:?}", e);
break;
};
// XX: success above but failure here permanently malforms the trace file
if let Err(e) = info.file.write(",\n".as_bytes()) {
eprintln!("\rError writing trace to file: {:?}", e);
break;
};
obj.write(&mut info.file)
})?;
info.file.write_all(",\n".as_bytes())?;
trace_stack = (*trace_stack).next;
}
});
}
if let Err(e) = info.file.sync_data() {
eprintln!("\rError syncing trace file: {:?}", e);
};
info.file.sync_data()?;
Ok(())
}
// XX: Need Rust string interpolation helper that doesn't allocate