Skip to content

Commit ae379bd

Browse files
borsbors
committed
Auto merge of #48691 - Zoxc:profq-chan, r=michaelwoerister
Move PROFQ_CHAN to a Session field r? @michaelwoerister
2 parents 0bae326 + 184fd32 commit ae379bd

File tree

18 files changed

+175
-170
lines changed

18 files changed

+175
-170
lines changed

‎src/librustc/dep_graph/graph.rs

+19-18
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
// except according to those terms.
1010

1111
use errors::DiagnosticBuilder;
12-
use rustc_data_structures::stable_hasher::{HashStable, StableHasher,
13-
StableHashingContextProvider};
12+
use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
1413
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
1514
use rustc_data_structures::indexed_vec::{Idx, IndexVec};
1615
use rustc_data_structures::sync::Lrc;
@@ -20,7 +19,7 @@ use std::hash::Hash;
2019
use ty::TyCtxt;
2120
use util::common::{ProfileQueriesMsg, profq_msg};
2221

23-
use ich::Fingerprint;
22+
use ich::{StableHashingContext, StableHashingContextProvider, Fingerprint};
2423

2524
use super::debug::EdgeFilter;
2625
use super::dep_node::{DepNode, DepKind, WorkProductId};
@@ -189,47 +188,49 @@ impl DepGraph {
189188
/// `arg` parameter.
190189
///
191190
/// [rustc guide]: https://rust-lang-nursery.github.io/rustc-guide/incremental-compilation.html
192-
pub fn with_task<C, A, R, HCX>(&self,
191+
pub fn with_task<'gcx, C, A, R>(&self,
193192
key: DepNode,
194193
cx: C,
195194
arg: A,
196195
task: fn(C, A) -> R)
197196
-> (R, DepNodeIndex)
198-
where C: DepGraphSafe + StableHashingContextProvider<ContextType=HCX>,
199-
R: HashStable<HCX>,
197+
where C: DepGraphSafe + StableHashingContextProvider<'gcx>,
198+
R: HashStable<StableHashingContext<'gcx>>,
200199
{
201200
self.with_task_impl(key, cx, arg, task,
202201
|data, key| data.borrow_mut().push_task(key),
203202
|data, key| data.borrow_mut().pop_task(key))
204203
}
205204

206-
fn with_task_impl<C, A, R, HCX>(&self,
205+
fn with_task_impl<'gcx, C, A, R>(&self,
207206
key: DepNode,
208207
cx: C,
209208
arg: A,
210209
task: fn(C, A) -> R,
211210
push: fn(&RefCell<CurrentDepGraph>, DepNode),
212211
pop: fn(&RefCell<CurrentDepGraph>, DepNode) -> DepNodeIndex)
213212
-> (R, DepNodeIndex)
214-
where C: DepGraphSafe + StableHashingContextProvider<ContextType=HCX>,
215-
R: HashStable<HCX>,
213+
where C: DepGraphSafe + StableHashingContextProvider<'gcx>,
214+
R: HashStable<StableHashingContext<'gcx>>,
216215
{
217216
if let Some(ref data) = self.data {
218217
push(&data.current, key);
219-
if cfg!(debug_assertions) {
220-
profq_msg(ProfileQueriesMsg::TaskBegin(key.clone()))
221-
};
222218

223219
// In incremental mode, hash the result of the task. We don't
224220
// do anything with the hash yet, but we are computing it
225221
// anyway so that
226222
// - we make sure that the infrastructure works and
227223
// - we can get an idea of the runtime cost.
228-
let mut hcx = cx.create_stable_hashing_context();
224+
let mut hcx = cx.get_stable_hashing_context();
225+
226+
if cfg!(debug_assertions) {
227+
profq_msg(hcx.sess(), ProfileQueriesMsg::TaskBegin(key.clone()))
228+
};
229229

230230
let result = task(cx, arg);
231+
231232
if cfg!(debug_assertions) {
232-
profq_msg(ProfileQueriesMsg::TaskEnd)
233+
profq_msg(hcx.sess(), ProfileQueriesMsg::TaskEnd)
233234
};
234235

235236
let dep_node_index = pop(&data.current, key);
@@ -274,7 +275,7 @@ impl DepGraph {
274275
(result, dep_node_index)
275276
} else {
276277
if key.kind.fingerprint_needed_for_crate_hash() {
277-
let mut hcx = cx.create_stable_hashing_context();
278+
let mut hcx = cx.get_stable_hashing_context();
278279
let result = task(cx, arg);
279280
let mut stable_hasher = StableHasher::new();
280281
result.hash_stable(&mut hcx, &mut stable_hasher);
@@ -314,14 +315,14 @@ impl DepGraph {
314315

315316
/// Execute something within an "eval-always" task which is a task
316317
// that runs whenever anything changes.
317-
pub fn with_eval_always_task<C, A, R, HCX>(&self,
318+
pub fn with_eval_always_task<'gcx, C, A, R>(&self,
318319
key: DepNode,
319320
cx: C,
320321
arg: A,
321322
task: fn(C, A) -> R)
322323
-> (R, DepNodeIndex)
323-
where C: DepGraphSafe + StableHashingContextProvider<ContextType=HCX>,
324-
R: HashStable<HCX>,
324+
where C: DepGraphSafe + StableHashingContextProvider<'gcx>,
325+
R: HashStable<StableHashingContext<'gcx>>,
325326
{
326327
self.with_task_impl(key, cx, arg, task,
327328
|data, key| data.borrow_mut().push_eval_always_task(key),

‎src/librustc/ich/hcx.rs

+24-8
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ use syntax::symbol::Symbol;
3030
use syntax_pos::{Span, DUMMY_SP};
3131
use syntax_pos::hygiene;
3232

33-
use rustc_data_structures::stable_hasher::{HashStable, StableHashingContextProvider,
33+
use rustc_data_structures::stable_hasher::{HashStable,
3434
StableHasher, StableHasherResult,
3535
ToStableHashKey};
3636
use rustc_data_structures::accumulate_vec::AccumulateVec;
@@ -192,17 +192,33 @@ impl<'a> StableHashingContext<'a> {
192192
}
193193
}
194194

195-
impl<'a, 'gcx, 'lcx> StableHashingContextProvider for TyCtxt<'a, 'gcx, 'lcx> {
196-
type ContextType = StableHashingContext<'a>;
197-
fn create_stable_hashing_context(&self) -> Self::ContextType {
198-
(*self).create_stable_hashing_context()
195+
/// Something that can provide a stable hashing context.
196+
pub trait StableHashingContextProvider<'a> {
197+
fn get_stable_hashing_context(&self) -> StableHashingContext<'a>;
198+
}
199+
200+
impl<'a, 'b, T: StableHashingContextProvider<'a>> StableHashingContextProvider<'a>
201+
for &'b T {
202+
fn get_stable_hashing_context(&self) -> StableHashingContext<'a> {
203+
(**self).get_stable_hashing_context()
199204
}
200205
}
201206

207+
impl<'a, 'b, T: StableHashingContextProvider<'a>> StableHashingContextProvider<'a>
208+
for &'b mut T {
209+
fn get_stable_hashing_context(&self) -> StableHashingContext<'a> {
210+
(**self).get_stable_hashing_context()
211+
}
212+
}
213+
214+
impl<'a, 'gcx, 'lcx> StableHashingContextProvider<'a> for TyCtxt<'a, 'gcx, 'lcx> {
215+
fn get_stable_hashing_context(&self) -> StableHashingContext<'a> {
216+
(*self).create_stable_hashing_context()
217+
}
218+
}
202219

203-
impl<'a> StableHashingContextProvider for StableHashingContext<'a> {
204-
type ContextType = StableHashingContext<'a>;
205-
fn create_stable_hashing_context(&self) -> Self::ContextType {
220+
impl<'a> StableHashingContextProvider<'a> for StableHashingContext<'a> {
221+
fn get_stable_hashing_context(&self) -> StableHashingContext<'a> {
206222
self.clone()
207223
}
208224
}

‎src/librustc/ich/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
1313
pub use self::fingerprint::Fingerprint;
1414
pub use self::caching_codemap_view::CachingCodemapView;
15-
pub use self::hcx::{StableHashingContext, NodeIdHashingMode,
15+
pub use self::hcx::{StableHashingContextProvider, StableHashingContext, NodeIdHashingMode,
1616
hash_stable_trait_impls, compute_ignored_attr_names};
1717
mod fingerprint;
1818
mod caching_codemap_view;

‎src/librustc/session/mod.rs

+7-1
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ use session::config::{DebugInfoLevel, OutputType};
2424
use ty::tls;
2525
use util::nodemap::{FxHashMap, FxHashSet};
2626
use util::common::{duration_to_secs_str, ErrorReported};
27+
use util::common::ProfileQueriesMsg;
2728

28-
use rustc_data_structures::sync::Lrc;
29+
use rustc_data_structures::sync::{Lrc, Lock};
2930

3031
use syntax::ast::NodeId;
3132
use errors::{self, DiagnosticBuilder, DiagnosticId};
@@ -53,6 +54,7 @@ use std::io::Write;
5354
use std::path::{Path, PathBuf};
5455
use std::sync::{Once, ONCE_INIT};
5556
use std::time::Duration;
57+
use std::sync::mpsc;
5658

5759
mod code_stats;
5860
pub mod config;
@@ -126,6 +128,9 @@ pub struct Session {
126128
/// A cache of attributes ignored by StableHashingContext
127129
pub ignored_attr_names: FxHashSet<Symbol>,
128130

131+
/// Used by -Z profile-queries in util::common
132+
pub profile_channel: Lock<Option<mpsc::Sender<ProfileQueriesMsg>>>,
133+
129134
/// Some measurements that are being gathered during compilation.
130135
pub perf_stats: PerfStats,
131136

@@ -1131,6 +1136,7 @@ pub fn build_session_(
11311136
imported_macro_spans: RefCell::new(HashMap::new()),
11321137
incr_comp_session: RefCell::new(IncrCompSession::NotInitialized),
11331138
ignored_attr_names: ich::compute_ignored_attr_names(),
1139+
profile_channel: Lock::new(None),
11341140
perf_stats: PerfStats {
11351141
svh_time: Cell::new(Duration::from_secs(0)),
11361142
incr_comp_hashes_time: Cell::new(Duration::from_secs(0)),

‎src/librustc/ty/maps/plumbing.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
164164
macro_rules! profq_msg {
165165
($tcx:expr, $msg:expr) => {
166166
if cfg!(debug_assertions) {
167-
if $tcx.sess.profile_queries() {
168-
profq_msg($msg)
167+
if $tcx.sess.profile_queries() {
168+
profq_msg($tcx.sess, $msg)
169169
}
170170
}
171171
}

‎src/librustc/util/common.rs

+32-30
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ use ty::maps::{QueryMsg};
2626
use dep_graph::{DepNode};
2727
use proc_macro;
2828
use lazy_static;
29+
use session::Session;
2930

3031
// The name of the associated type for `Fn` return types
3132
pub const FN_OUTPUT_NAME: &'static str = "Output";
@@ -55,9 +56,6 @@ pub fn install_panic_hook() {
5556
lazy_static::initialize(&DEFAULT_HOOK);
5657
}
5758

58-
/// Initialized for -Z profile-queries
59-
thread_local!(static PROFQ_CHAN: RefCell<Option<Sender<ProfileQueriesMsg>>> = RefCell::new(None));
60-
6159
/// Parameters to the `Dump` variant of type `ProfileQueriesMsg`.
6260
#[derive(Clone,Debug)]
6361
pub struct ProfQDumpParams {
@@ -97,29 +95,23 @@ pub enum ProfileQueriesMsg {
9795
}
9896

9997
/// If enabled, send a message to the profile-queries thread
100-
pub fn profq_msg(msg: ProfileQueriesMsg) {
101-
PROFQ_CHAN.with(|sender|{
102-
if let Some(s) = sender.borrow().as_ref() {
103-
s.send(msg).unwrap()
104-
} else {
105-
// Do nothing.
106-
//
107-
// FIXME(matthewhammer): Multi-threaded translation phase triggers the panic below.
108-
// From backtrace: rustc_trans::back::write::spawn_work::{{closure}}.
109-
//
110-
// panic!("no channel on which to send profq_msg: {:?}", msg)
111-
}
112-
})
98+
pub fn profq_msg(sess: &Session, msg: ProfileQueriesMsg) {
99+
if let Some(s) = sess.profile_channel.borrow().as_ref() {
100+
s.send(msg).unwrap()
101+
} else {
102+
// Do nothing
103+
}
113104
}
114105

115106
/// Set channel for profile queries channel
116-
pub fn profq_set_chan(s: Sender<ProfileQueriesMsg>) -> bool {
117-
PROFQ_CHAN.with(|chan|{
118-
if chan.borrow().is_none() {
119-
*chan.borrow_mut() = Some(s);
120-
true
121-
} else { false }
122-
})
107+
pub fn profq_set_chan(sess: &Session, s: Sender<ProfileQueriesMsg>) -> bool {
108+
let mut channel = sess.profile_channel.borrow_mut();
109+
if channel.is_none() {
110+
*channel = Some(s);
111+
true
112+
} else {
113+
false
114+
}
123115
}
124116

125117
/// Read the current depth of `time()` calls. This is used to
@@ -135,7 +127,13 @@ pub fn set_time_depth(depth: usize) {
135127
TIME_DEPTH.with(|slot| slot.set(depth));
136128
}
137129

138-
pub fn time<T, F>(do_it: bool, what: &str, f: F) -> T where
130+
pub fn time<T, F>(sess: &Session, what: &str, f: F) -> T where
131+
F: FnOnce() -> T,
132+
{
133+
time_ext(sess.time_passes(), Some(sess), what, f)
134+
}
135+
136+
pub fn time_ext<T, F>(do_it: bool, sess: Option<&Session>, what: &str, f: F) -> T where
139137
F: FnOnce() -> T,
140138
{
141139
if !do_it { return f(); }
@@ -146,15 +144,19 @@ pub fn time<T, F>(do_it: bool, what: &str, f: F) -> T where
146144
r
147145
});
148146

149-
if cfg!(debug_assertions) {
150-
profq_msg(ProfileQueriesMsg::TimeBegin(what.to_string()))
151-
};
147+
if let Some(sess) = sess {
148+
if cfg!(debug_assertions) {
149+
profq_msg(sess, ProfileQueriesMsg::TimeBegin(what.to_string()))
150+
}
151+
}
152152
let start = Instant::now();
153153
let rv = f();
154154
let dur = start.elapsed();
155-
if cfg!(debug_assertions) {
156-
profq_msg(ProfileQueriesMsg::TimeEnd)
157-
};
155+
if let Some(sess) = sess {
156+
if cfg!(debug_assertions) {
157+
profq_msg(sess, ProfileQueriesMsg::TimeEnd)
158+
}
159+
}
158160

159161
print_time_passes_entry_internal(what, dur);
160162

‎src/librustc_data_structures/stable_hasher.rs

-23
Original file line numberDiff line numberDiff line change
@@ -165,29 +165,6 @@ impl<W> Hasher for StableHasher<W> {
165165
}
166166
}
167167

168-
169-
/// Something that can provide a stable hashing context.
170-
pub trait StableHashingContextProvider {
171-
type ContextType;
172-
fn create_stable_hashing_context(&self) -> Self::ContextType;
173-
}
174-
175-
impl<'a, T: StableHashingContextProvider> StableHashingContextProvider for &'a T {
176-
type ContextType = T::ContextType;
177-
178-
fn create_stable_hashing_context(&self) -> Self::ContextType {
179-
(**self).create_stable_hashing_context()
180-
}
181-
}
182-
183-
impl<'a, T: StableHashingContextProvider> StableHashingContextProvider for &'a mut T {
184-
type ContextType = T::ContextType;
185-
186-
fn create_stable_hashing_context(&self) -> Self::ContextType {
187-
(**self).create_stable_hashing_context()
188-
}
189-
}
190-
191168
/// Something that implements `HashStable<CTX>` can be hashed in a way that is
192169
/// stable across multiple compilation sessions.
193170
pub trait HashStable<CTX> {

0 commit comments

Comments
 (0)