Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tweak crate loading to load less metadata #13384

Closed
wants to merge 3 commits into from
Closed

Tweak crate loading to load less metadata #13384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d24fad
rustc: Use CStore, not a separate crate cache
alexcrichton Apr 7, 2014
e2d34d7
rustc: Never register syntax crates in CStore
alexcrichton Apr 7, 2014
fe78af4
rustc: Don't read both rlib and dylib metadata
alexcrichton Apr 7, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/librustc/driver/driver.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,6 @@ pub fn phase_2_configure_and_expand(sess: &Session,
cfg,
krate)
});
// dump the syntax-time crates
sess.cstore.reset();

// strip again, in case expansion added anything with a #[cfg].
krate = time(time_passes, "configuration 2", krate, |krate|
Expand Down
192 changes: 91 additions & 101 deletions src/librustc/metadata/creader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ use driver::{driver, session};
use driver::session::Session;
use metadata::csearch;
use metadata::cstore;
use metadata::cstore::CStore;
use metadata::decoder;
use metadata::loader;
use metadata::loader::Os;
Expand All @@ -38,6 +39,13 @@ use syntax::parse::token;
use syntax::crateid::CrateId;
use syntax::visit;

struct Env<'a> {
sess: &'a Session,
os: loader::Os,
next_crate_num: ast::CrateNum,
intr: Rc<IdentInterner>
}

// Traverses an AST, reading all the information about use'd crates and extern
// libraries necessary for later resolving, typechecking, linking, etc.
pub fn read_crates(sess: &Session,
Expand All @@ -47,16 +55,13 @@ pub fn read_crates(sess: &Session,
let mut e = Env {
sess: sess,
os: os,
crate_cache: @RefCell::new(Vec::new()),
next_crate_num: 1,
next_crate_num: sess.cstore.next_crate_num(),
intr: intr
};
visit_crate(&e, krate);
visit::walk_crate(&mut e, krate, ());
dump_crates(e.crate_cache.borrow().as_slice());
warn_if_multiple_versions(&mut e,
sess.diagnostic(),
e.crate_cache.borrow().as_slice());
dump_crates(&sess.cstore);
warn_if_multiple_versions(sess.diagnostic(), &sess.cstore)
}

impl<'a> visit::Visitor<()> for Env<'a> {
Expand All @@ -70,55 +75,36 @@ impl<'a> visit::Visitor<()> for Env<'a> {
}
}

#[deriving(Clone)]
struct cache_entry {
cnum: ast::CrateNum,
span: Span,
hash: Svh,
crate_id: CrateId,
}

fn dump_crates(crate_cache: &[cache_entry]) {
fn dump_crates(cstore: &CStore) {
debug!("resolved crates:");
for entry in crate_cache.iter() {
debug!("cnum: {:?}", entry.cnum);
debug!("span: {:?}", entry.span);
debug!("hash: {:?}", entry.hash);
}
cstore.iter_crate_data(|_, data| {
debug!("crate_id: {}", data.crate_id());
debug!(" cnum: {}", data.cnum);
debug!(" hash: {}", data.hash());
})
}

fn warn_if_multiple_versions(e: &mut Env,
diag: &SpanHandler,
crate_cache: &[cache_entry]) {
if crate_cache.len() != 0u {
let name = crate_cache[crate_cache.len() - 1].crate_id.name.clone();

let (matches, non_matches) = crate_cache.partitioned(|entry|
name == entry.crate_id.name);
fn warn_if_multiple_versions(diag: &SpanHandler, cstore: &CStore) {
let mut map = HashMap::new();

assert!(!matches.is_empty());
cstore.iter_crate_data(|cnum, data| {
let crateid = data.crate_id();
let key = (crateid.name.clone(), crateid.path.clone());
map.find_or_insert_with(key, |_| Vec::new()).push(cnum);
});

if matches.len() != 1u {
diag.handler().warn(
format!("using multiple versions of crate `{}`", name));
for match_ in matches.iter() {
diag.span_note(match_.span, "used here");
loader::note_crateid_attr(diag, &match_.crate_id);
}
for ((name, _), dupes) in map.move_iter() {
if dupes.len() == 1 { continue }
diag.handler().warn(
format!("using multiple versions of crate `{}`", name));
for dupe in dupes.move_iter() {
let data = cstore.get_crate_data(dupe);
diag.span_note(data.span, "used here");
loader::note_crateid_attr(diag, &data.crate_id());
}

warn_if_multiple_versions(e, diag, non_matches);
}
}

struct Env<'a> {
sess: &'a Session,
os: loader::Os,
crate_cache: @RefCell<Vec<cache_entry>>,
next_crate_num: ast::CrateNum,
intr: Rc<IdentInterner>
}

fn visit_crate(e: &Env, c: &ast::Crate) {
for a in c.attrs.iter().filter(|m| m.name().equiv(&("link_args"))) {
match a.value_str() {
Expand All @@ -128,22 +114,25 @@ fn visit_crate(e: &Env, c: &ast::Crate) {
}
}

fn visit_view_item(e: &mut Env, i: &ast::ViewItem) {
let should_load = i.attrs.iter().all(|attr| {
fn should_link(i: &ast::ViewItem) -> bool {
i.attrs.iter().all(|attr| {
attr.name().get() != "phase" ||
attr.meta_item_list().map_or(false, |phases| {
attr::contains_name(phases.as_slice(), "link")
})
});
})
}

if !should_load {
fn visit_view_item(e: &mut Env, i: &ast::ViewItem) {
if !should_link(i) {
return;
}

match extract_crate_info(e, i) {
Some(info) => {
let cnum = resolve_crate(e, &None, info.ident, &info.crate_id, None,
i.span);
let (cnum, _, _) = resolve_crate(e, &None, info.ident,
&info.crate_id, None, true,
i.span);
e.sess.cstore.add_extern_mod_stmt_cnum(info.id, cnum);
}
None => ()
Expand All @@ -154,6 +143,7 @@ struct CrateInfo {
ident: ~str,
crate_id: CrateId,
id: ast::NodeId,
should_link: bool,
}

fn extract_crate_info(e: &Env, i: &ast::ViewItem) -> Option<CrateInfo> {
Expand All @@ -179,6 +169,7 @@ fn extract_crate_info(e: &Env, i: &ast::ViewItem) -> Option<CrateInfo> {
ident: ident.get().to_str(),
crate_id: crate_id,
id: id,
should_link: should_link(i),
})
}
_ => None
Expand Down Expand Up @@ -269,23 +260,29 @@ fn visit_item(e: &Env, i: &ast::Item) {

fn existing_match(e: &Env, crate_id: &CrateId,
hash: Option<&Svh>) -> Option<ast::CrateNum> {
for c in e.crate_cache.borrow().iter() {
if !crate_id.matches(&c.crate_id) { continue }
match hash {
Some(hash) if *hash != c.hash => {}
Some(..) | None => return Some(c.cnum)
let mut ret = None;
e.sess.cstore.iter_crate_data(|cnum, data| {
let other_id = data.crate_id();
if crate_id.matches(&other_id) {
let other_hash = data.hash();
match hash {
Some(hash) if *hash != other_hash => {}
Some(..) | None => { ret = Some(cnum); }
}
}
}
None
});
return ret;
}

fn resolve_crate<'a>(e: &mut Env,
root: &Option<CratePaths>,
ident: &str,
crate_id: &CrateId,
hash: Option<&Svh>,
should_link: bool,
span: Span)
-> ast::CrateNum {
-> (ast::CrateNum, @cstore::crate_metadata,
cstore::CrateSource) {
match existing_match(e, crate_id, hash) {
None => {
let id_hash = link::crate_id_hash(crate_id);
Expand All @@ -304,17 +301,8 @@ fn resolve_crate<'a>(e: &mut Env,
dylib, rlib, metadata
} = load_ctxt.load_library_crate(root);

let crate_id = decoder::get_crate_id(metadata.as_slice());
let hash = decoder::get_crate_hash(metadata.as_slice());

// Claim this crate number and cache it
let cnum = e.next_crate_num;
e.crate_cache.borrow_mut().push(cache_entry {
cnum: cnum,
span: span,
hash: hash,
crate_id: crate_id,
});
e.next_crate_num += 1;

// Stash paths for top-most crate locally if necessary.
Expand All @@ -331,27 +319,35 @@ fn resolve_crate<'a>(e: &mut Env,
let root = if root.is_some() { root } else { &crate_paths };

// Now resolve the crates referenced by this crate
let cnum_map = resolve_crate_deps(e,
root,
metadata.as_slice(),
span);
let cnum_map = if should_link {
resolve_crate_deps(e, root, metadata.as_slice(), span)
} else {
@RefCell::new(HashMap::new())
};

let cmeta = @cstore::crate_metadata {
name: load_ctxt.crate_id.name.to_owned(),
data: metadata,
cnum_map: cnum_map,
cnum: cnum
cnum: cnum,
span: span,
};

e.sess.cstore.set_crate_data(cnum, cmeta);
e.sess.cstore.add_used_crate_source(cstore::CrateSource {
let source = cstore::CrateSource {
dylib: dylib,
rlib: rlib,
cnum: cnum,
});
cnum
};

if should_link {
e.sess.cstore.set_crate_data(cnum, cmeta);
e.sess.cstore.add_used_crate_source(source.clone());
}
(cnum, cmeta, source)
}
Some(cnum) => cnum
Some(cnum) => (cnum,
e.sess.cstore.get_crate_data(cnum),
e.sess.cstore.get_used_crate_source(cnum).unwrap())
}
}

Expand All @@ -368,11 +364,12 @@ fn resolve_crate_deps(e: &mut Env,
for dep in r.iter() {
let extrn_cnum = dep.cnum;
debug!("resolving dep crate {} hash: `{}`", dep.crate_id, dep.hash);
let local_cnum = resolve_crate(e, root,
dep.crate_id.name.as_slice(),
&dep.crate_id,
Some(&dep.hash),
span);
let (local_cnum, _, _) = resolve_crate(e, root,
dep.crate_id.name.as_slice(),
&dep.crate_id,
Some(&dep.hash),
true,
span);
cnum_map.insert(extrn_cnum, local_cnum);
}
return @RefCell::new(cnum_map);
Expand All @@ -390,8 +387,7 @@ impl<'a> Loader<'a> {
env: Env {
sess: sess,
os: os,
crate_cache: @RefCell::new(Vec::new()),
next_crate_num: 1,
next_crate_num: sess.cstore.next_crate_num(),
intr: token::get_ident_interner(),
}
}
Expand All @@ -401,23 +397,17 @@ impl<'a> Loader<'a> {
impl<'a> CrateLoader for Loader<'a> {
fn load_crate(&mut self, krate: &ast::ViewItem) -> MacroCrate {
let info = extract_crate_info(&self.env, krate).unwrap();
let cnum = resolve_crate(&mut self.env, &None, info.ident,
&info.crate_id, None, krate.span);
let library = self.env.sess.cstore.get_used_crate_source(cnum).unwrap();
let (cnum, data, library) = resolve_crate(&mut self.env, &None,
info.ident, &info.crate_id,
None, true, krate.span);
let macros = decoder::get_exported_macros(data);
let cstore = &self.env.sess.cstore;
let registrar = csearch::get_macro_registrar_fn(cstore, cnum)
.map(|did| csearch::get_symbol(cstore, did));
MacroCrate {
lib: library.dylib,
cnum: cnum
macros: macros.move_iter().collect(),
registrar_symbol: registrar,
}
}

fn get_exported_macros(&mut self, cnum: ast::CrateNum) -> Vec<~str> {
csearch::get_exported_macros(&self.env.sess.cstore, cnum).move_iter()
.collect()
}

fn get_registrar_symbol(&mut self, cnum: ast::CrateNum) -> Option<~str> {
let cstore = &self.env.sess.cstore;
csearch::get_macro_registrar_fn(cstore, cnum)
.map(|did| csearch::get_symbol(cstore, did))
}
}
12 changes: 12 additions & 0 deletions src/librustc/metadata/cstore.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ use std::c_vec::CVec;
use std::rc::Rc;
use collections::HashMap;
use syntax::ast;
use syntax::crateid::CrateId;
use syntax::codemap::Span;
use syntax::parse::token::IdentInterner;

// A map from external crate numbers (as decoded from some crate file) to
Expand All @@ -40,6 +42,7 @@ pub struct crate_metadata {
pub data: MetadataBlob,
pub cnum_map: cnum_map,
pub cnum: ast::CrateNum,
pub span: Span,
}

#[deriving(Eq)]
Expand Down Expand Up @@ -88,6 +91,10 @@ impl CStore {
}
}

pub fn next_crate_num(&self) -> ast::CrateNum {
self.metas.borrow().len() as ast::CrateNum + 1
}

pub fn get_crate_data(&self, cnum: ast::CrateNum) -> @crate_metadata {
*self.metas.borrow().get(&cnum)
}
Expand Down Expand Up @@ -121,6 +128,9 @@ impl CStore {
.map(|source| source.clone())
}

pub fn dump_phase_syntax_crates(&self) {
}

pub fn reset(&self) {
self.metas.borrow_mut().clear();
self.extern_mod_crate_map.borrow_mut().clear();
Expand Down Expand Up @@ -202,6 +212,8 @@ impl CStore {

impl crate_metadata {
pub fn data<'a>(&'a self) -> &'a [u8] { self.data.as_slice() }
pub fn crate_id(&self) -> CrateId { decoder::get_crate_id(self.data()) }
pub fn hash(&self) -> Svh { decoder::get_crate_hash(self.data()) }
}

impl MetadataBlob {
Expand Down
Loading