M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

runtime: replace a (deliberate) memory leak with an interner.

This commit is contained in:
whitequark 2016-11-21 19:47:56 +00:00
parent ac997daf95
commit 1d1e821a74
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
artiq/runtime.rs/src/session.rs
View File

@ -2,6 +2,7 @@ use std::prelude::v1::*;
use std::{mem, str}; use std::{mem, str};
use std::cell::RefCell; use std::cell::RefCell;
use std::io::{self, Read, Write, BufWriter}; use std::io::{self, Read, Write, BufWriter};
use std::btree_set::BTreeSet;
use {config, rtio_crg, clock, mailbox, rpc_queue, kernel}; use {config, rtio_crg, clock, mailbox, rpc_queue, kernel};
use logger::BufferLogger; use logger::BufferLogger;
use cache::Cache; use cache::Cache;
@ -57,7 +58,8 @@ struct Session<'a> {
congress: &'a mut Congress, congress: &'a mut Congress,
kernel_state: KernelState, kernel_state: KernelState,
watchdog_set: clock::WatchdogSet, watchdog_set: clock::WatchdogSet,
log_buffer: String log_buffer: String,
interner: BTreeSet<String>
} }
impl<'a> Session<'a> { impl<'a> Session<'a> {
@ -66,7 +68,8 @@ impl<'a> Session<'a> {
congress: congress, congress: congress,
kernel_state: KernelState::Absent, kernel_state: KernelState::Absent,
watchdog_set: clock::WatchdogSet::new(), watchdog_set: clock::WatchdogSet::new(),
log_buffer: String::new() log_buffer: String::new(),
interner: BTreeSet::new()
} }
} }
@ -309,20 +312,20 @@ fn process_host_message(waiter: Waiter,
})); }));
// FIXME: gross. // FIXME: gross.
fn into_c_str(s: String) -> *const u8 { fn into_c_str(interner: &mut BTreeSet<String>, s: String) -> *const u8 {
let s = s + "\0"; let s = s + "\0";
let p = s.as_bytes().as_ptr(); interner.insert(s.clone());
mem::forget(s); let p = interner.get(&s).unwrap().as_bytes().as_ptr();
p p
} }
let exn = kern::Exception { let exn = kern::Exception {
name: into_c_str(name), name: into_c_str(&mut session.interner, name),
message: into_c_str(message), message: into_c_str(&mut session.interner, message),
param: param, param: param,
file: into_c_str(file), file: into_c_str(&mut session.interner, file),
line: line, line: line,
column: column, column: column,
function: into_c_str(function), function: into_c_str(&mut session.interner, function),
phantom: ::core::marker::PhantomData phantom: ::core::marker::PhantomData
}; };
try!(kern_send(waiter, &kern::RpcRecvReply(Err(exn)))); try!(kern_send(waiter, &kern::RpcRecvReply(Err(exn))));