Move PROFQ_CHAN to a Session field by Zoxc · Pull Request #48691 · rust-lang/rust

Zoxc · 2018-03-03T06:45:37Z

Zoxc · 2018-03-03T06:48:00Z

Note that this is the point were the Rayon thread pool is created in my branch. This is split out to its own function to avoid rightward drift (and merge conflicts).

Zoxc · 2018-03-03T06:52:52Z

@alexcrichton Can you release a version of scoped-tls with the visibility modifier so we don't have to link to a github repo?

alexcrichton · 2018-03-03T21:29:29Z

Sure! It's now published

michaelwoerister · 2018-03-05T10:03:43Z

Would it be possible to move this into TyCtxt::create_and_enter(), maybe even make the sender a local variable there instead of a field of Session?

Zoxc · 2018-03-05T22:10:51Z

@alexcrichton I get this error if I try to use 0.1.1:

error: failed to select a version for `scoped-tls`
all possible versions conflict with previously selected versions of `scoped-tls`
required by package `cargo v0.26.0 (file:///B:/dev/rust/par-merge/src/tools/cargo)`
... which is depended on by `rls v0.126.0 (file:///B:/dev/rust/par-merge/src/tools/rls)`
previously selected package `scoped-tls v0.1.1`
... which is depended on by `rustc v0.0.0 (file:///B:/dev/rust/par-merge/src/librustc)`
... which is depended on by `rustc_trans v0.0.0 (file:///B:/dev/rust/par-merge/src/librustc_trans)`
possible versions to select: 0.1.0
failed to run: B:\dev\rust\par-merge\build\x86_64-pc-windows-msvc\stage0\bin\cargo.exe build --manifest-path B:\dev\rust\par-merge\src/bootstrap/Cargo.toml

@michaelwoerister It is used when no TyCtxt exists. I also prefer globals to be part of the Session struct instead of hiding in thread local storage. I should check if it's feasible to pass &Session to profq_msg and get rid of PROFQ_CHAN.

alexcrichton · 2018-03-05T22:16:13Z

@Zoxc sounds like rust-lang/cargo#4127

michaelwoerister · 2018-03-06T08:45:20Z

I should check if it's feasible to pass &Session to profq_msg and get rid of PROFQ_CHAN.

That sounds good too.

Zoxc · 2018-03-06T09:00:56Z

profq_msg is used for time, which is used in LLVM workers which doesn't have access to Session. That should be fixable by passing Option<&Session> to time. It's also used in with_task_impl which also doesn't have Session access, but providing that there shouldn't be too hard.

michaelwoerister · 2018-03-06T09:46:09Z

Do what you have to :)

I think this query profiling infrastructure is in dire need of a refactoring.

Zoxc · 2018-03-06T11:59:37Z

I removed PROFQ_CHAN. Now there's even more changes for you to review.

michaelwoerister · 2018-03-06T13:58:07Z

Looks good to me. Thank you, @Zoxc! r=me once travis passes.

bors · 2018-03-06T15:02:28Z

☔ The latest upstream changes (presumably #48611) made this pull request unmergeable. Please resolve the merge conflicts.

Zoxc · 2018-03-07T03:01:33Z

@bors r=michaelwoerister

bors · 2018-03-07T03:01:34Z

📌 Commit 97b23a0 has been approved by michaelwoerister

bors · 2018-03-08T11:35:43Z

☔ The latest upstream changes (presumably #46882) made this pull request unmergeable. Please resolve the merge conflicts.

Zoxc · 2018-03-09T06:30:47Z

@bors r=michaelwoerister

bors · 2018-03-09T06:30:47Z

📌 Commit 4ab6367 has been approved by michaelwoerister

bors · 2018-03-09T06:31:03Z

☔ The latest upstream changes (presumably #48860) made this pull request unmergeable. Please resolve the merge conflicts.

Zoxc · 2018-03-09T10:44:08Z

@bors r=michaelwoerister

bors · 2018-03-09T10:44:09Z

📌 Commit 184fd32 has been approved by michaelwoerister

bors · 2018-03-09T14:58:33Z

⌛ Testing commit 184fd32 with merge c4b30439801c581bcc4da232971bc79d22893e8e...

bors · 2018-03-09T16:18:14Z

💔 Test failed - status-travis

kennytm · 2018-03-09T16:22:56Z

@bors retry #48866

bors · 2018-03-11T04:34:14Z

⌛ Testing commit 184fd32 with merge ae379bd...

@michaelwoerister

Move PROFQ_CHAN to a Session field r? @michaelwoerister

bors · 2018-03-11T07:04:56Z

☀️ Test successful - status-appveyor, status-travis
Approved by: michaelwoerister
Pushing ae379bd to master...

rust-highfive assigned michaelwoerister Mar 3, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 3, 2018

Zoxc commented Mar 3, 2018
View reviewed changes

Zoxc force-pushed the profq-chan branch 2 times, most recently from 46233b6 to 019b9a8Compare March 3, 2018 07:14

Zoxc changed the title ~~Make PROFQ_CHAN a scoped thread local~~Move PROFQ_CHAN to a Session fieldMar 6, 2018

Zoxc force-pushed the profq-chan branch 3 times, most recently from 23307ee to 7d3aaf9Compare March 6, 2018 11:56

Zoxc force-pushed the profq-chan branch from 7d3aaf9 to c658daaCompare March 6, 2018 13:09

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 6, 2018

Zoxc force-pushed the profq-chan branch from c658daa to 97b23a0Compare March 6, 2018 23:34

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 7, 2018

bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 8, 2018

Zoxc force-pushed the profq-chan branch from 97b23a0 to 4ab6367Compare March 9, 2018 04:25

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 9, 2018

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 9, 2018

Move PROFQ_CHAN to a Session field
184fd32

Zoxc force-pushed the profq-chan branch from 4ab6367 to 184fd32Compare March 9, 2018 07:04

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 9, 2018

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 9, 2018

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 9, 2018

bors added a commit that referenced this pull request Mar 11, 2018
Auto merge of#48691- Zoxc:profq-chan, r=michaelwoerister
ae379bd
Move PROFQ_CHAN to a Session field r? @michaelwoerister

bors merged commit 184fd32 into rust-lang:masterMar 11, 2018

This was referenced Mar 11, 2018
syntax: Make imports in AST closer to the source and cleanup their parsing #48917
Merged
Mark JoinHandle with #[must_use] #48830
Closed

Zoxc deleted the profq-chan branch March 14, 2018 16:38

aturon mentioned this pull request Aug 16, 2019
Audit sources of shared state across rustc #63643
Closed
37 tasks

Uh oh!

Uh oh!

Conversation

Zoxc commented Mar 3, 2018

Uh oh!

ZoxcMar 3, 2018

Choose a reason for hiding this comment

Uh oh!

Zoxc commented Mar 3, 2018

Uh oh!

alexcrichton commented Mar 3, 2018

Uh oh!

michaelwoerister commented Mar 5, 2018

Uh oh!

Zoxc commented Mar 5, 2018

Uh oh!

alexcrichton commented Mar 5, 2018

Uh oh!

michaelwoerister commented Mar 6, 2018

Uh oh!

Zoxc commented Mar 6, 2018

Uh oh!

michaelwoerister commented Mar 6, 2018

Uh oh!

Zoxc commented Mar 6, 2018

Uh oh!

michaelwoerister commented Mar 6, 2018

Uh oh!

bors commented Mar 6, 2018

Uh oh!

Zoxc commented Mar 7, 2018

Uh oh!

bors commented Mar 7, 2018

Uh oh!

bors commented Mar 8, 2018

Uh oh!

Zoxc commented Mar 9, 2018

Uh oh!

bors commented Mar 9, 2018

Uh oh!

bors commented Mar 9, 2018

Uh oh!

Zoxc commented Mar 9, 2018

Uh oh!

bors commented Mar 9, 2018

Uh oh!

bors commented Mar 9, 2018

Uh oh!

bors commented Mar 9, 2018

Uh oh!

kennytm commented Mar 9, 2018

Uh oh!

bors commented Mar 11, 2018

Uh oh!

bors commented Mar 11, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants