Switch to crossbeam-channel #183

SimonSapin · 2017-12-18T00:51:39Z

Code changes by @stjepang.

CC servo/servo#19515

antrik

AIUI, this is still WIP, pending some crossbeam-channel changes?

A few of my usual nitpicks...

antrik · 2017-12-18T02:33:15Z

src/platform/inprocess/mod.rs

-                    break;
-                }
+            if sel.timed_out() { // TODO: this should be any_disconnected
+                break;


I'm confused: is this actually a viable (though hopefully temporary) workaround somehow -- or is it just plain wrong, but not covered by our test-suite?...

This is a (working) temporary workaround. Let's wait for some changes to crossbeam-channel and then do the right thing here.

antrik · 2017-12-18T02:35:43Z

src/platform/inprocess/mod.rs

@@ -8,7 +8,7 @@
 // except according to those terms.

 use bincode;
-use std::sync::mpsc;
+use crossbeam_channel::{self, Receiver, Select, Sender};


Personally, I find importing generic names such as Receiver etc. without a prefix rather confusing... Is that just me?

Well, crossbeam_channel::Receiver may be a tad too verbose (although mpsc::Receiver was totally reasonable). Any suggestions? Should we just stick with crossbeam_channel::Receiver?

Personally, I wouldn't mind the verbose variant... But if you prefer something shorter, you can rename it to a different prefix in the use statement.

antrik · 2017-12-18T02:48:42Z

src/platform/inprocess/mod.rs

+            .unwrap()
+            .get(&self.name)
+            .unwrap()
+            .clone();


As far as I can tell, this statement got reformatted, although it's entirely unchanged otherwise? I'm not fond of patches being cluttered with this kind of unrelated changes...

(And I'm not even convinced the statement actually becomes more readable in this way -- though that's a matter of taste I guess...)

MpscError was changed to ChannelError, but other than that, the code is the same. This formatting was produced by rustfmt. The original is kinda messy - misaligned indentation, missing spaces after commas, etc. I can roll back a few formatting changes...

I meant just the last line. The function signature reformatting is fine, since you have to touch that anyway -- and the change is a definite improvement there :-)

Actually, in this one instance, I actually do have a minor qualm about the function signature formatting, which I considered mentioning: with the indentation style change, the tuple would now easily fit on one line -- and I tend to think that would be more readable... But then again, I don't really have experience with this style yet -- maybe the more spacey variant is actually more readable after some getting used to?... Not sure. (Which is why I didn't bring it up originally.)

antrik · 2017-12-18T02:56:52Z

src/platform/inprocess/mod.rs

@@ -373,35 +373,37 @@ impl OsIpcSharedMemory {
 }

 #[derive(Debug, PartialEq)]
-pub enum MpscError {
+pub enum ChannelError {


Unfortunately, Channel is rather confusing in this context, as it's not clear that it refers to the underlying crossbeam_channel mechanism, rather than the IPC channels...

Not sure whether that's a real problem, though.

This seems to be a breaking change since it changes the public API. Should we stick with MpscError? Or, if we're going to change the name, do you have a better suggestion that ChannelError?

The change of name and more importantly return type of RouterProxy::route_ipc_receiver_to_* makes this a breaking change anyway, so no need to worry about that here.

I think that @antrik’s concern is rather that the term "channel" is overloaded. Maybe CrossbeamChannelError? (Assuming this name does indeed refer to the crate.)

ghost · 2017-12-18T12:43:15Z

Yes, this is a WIP, pending some crossbeam-channel changes.

bors-servo · 2018-02-15T21:21:15Z

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

SimonSapin · 2018-06-11T16:05:46Z

@bors-servo try

bors-servo · 2018-06-11T16:05:50Z

⌛ Trying commit 220e0e5 with merge b32f48a...

@stjepang

Switch to crossbeam-channel Code changes by @stjepang. CC servo/servo#19515

bors-servo · 2018-06-11T16:10:29Z

💔 Test failed - status-appveyor

SimonSapin · 2018-06-11T17:55:01Z

@bors-servo try

bors-servo · 2018-06-11T17:55:04Z

⌛ Trying commit 1d7bf81 with merge 6fb2335...

@stjepang

Switch to crossbeam-channel Code changes by @stjepang. CC servo/servo#19515

bors-servo · 2018-06-11T18:05:25Z

💔 Test failed - status-appveyor

SimonSapin · 2018-06-11T21:39:30Z

@bors-servo try

bors-servo · 2018-06-11T21:39:33Z

⌛ Trying commit cf1acd6 with merge 9950293...

@stjepang

Switch to crossbeam-channel Code changes by @stjepang. CC servo/servo#19515

bors-servo · 2018-06-11T21:45:20Z

☀️ Test successful - status-appveyor, status-travis
State: approved= try=True

Replace mpsc with crossbeam-channel Follow up on #19515 --- Selecting over multiple channels in `std::sync::mpsc` is not stable and likely never will be: rust-lang/rust#27800 (comment) > It seems the only thing keeping `mpsc_select` around is Servo. crossbeam-channel is designed specifically to replace `std::sync::mpsc` and fix many of its shortcomings: https://github.com/stjepang/rfcs-crossbeam/blob/channel/text/2017-11-09-channel.md This is to be landed together with servo/ipc-channel#183. ---  - [ ] `./mach build -d` does not report any errors - [ ] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable).  - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____    --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21325)

@stjepang

Switch to crossbeam-channel Code changes by @stjepang. CC servo/servo#19515

bors-servo · 2018-08-09T17:44:15Z

⌛ Testing commit 614e4c9 with merge 17c4e26...

bors-servo · 2018-08-09T17:47:47Z

☀️ Test successful - status-appveyor, status-travis
Approved by: SimonSapin+stjepang
Pushing 17c4e26 to master...

Replace mpsc with crossbeam-channel Follow up on #19515 --- Selecting over multiple channels in `std::sync::mpsc` is not stable and likely never will be: rust-lang/rust#27800 (comment) > It seems the only thing keeping `mpsc_select` around is Servo. crossbeam-channel is designed specifically to replace `std::sync::mpsc` and fix many of its shortcomings: https://github.com/stjepang/rfcs-crossbeam/blob/channel/text/2017-11-09-channel.md This is to be landed together with servo/ipc-channel#183.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21325)

SimonSapin mentioned this pull request Dec 18, 2017

Replace mpsc with crossbeam-channel servo/servo#19515

Closed

antrik reviewed Dec 18, 2017

View reviewed changes

highfive added the S-needs-rebase label Feb 15, 2018

Ms2ger mentioned this pull request Feb 19, 2018

Tracking: Unstable Rust feature gates used by Servo servo/servo#5286

Closed

99 tasks

SimonSapin force-pushed the crossbeam-channel branch from a78a743 to 220e0e5 Compare June 11, 2018 16:05

highfive added the S-awaiting-review label Jun 11, 2018

bors-servo pushed a commit that referenced this pull request Jun 11, 2018

Auto merge of #183 - servo:crossbeam-channel, r=<try>

b32f48a

Switch to crossbeam-channel Code changes by @stjepang. CC servo/servo#19515

highfive added the S-tests-failed label Jun 11, 2018

SimonSapin force-pushed the crossbeam-channel branch from 220e0e5 to 1d7bf81 Compare June 11, 2018 17:54

highfive removed the S-tests-failed label Jun 11, 2018

bors-servo pushed a commit that referenced this pull request Jun 11, 2018

Auto merge of #183 - servo:crossbeam-channel, r=<try>

6fb2335

Switch to crossbeam-channel Code changes by @stjepang. CC servo/servo#19515

highfive added the S-tests-failed label Jun 11, 2018

SimonSapin force-pushed the crossbeam-channel branch from 1d7bf81 to d0bd3e7 Compare June 11, 2018 18:15

highfive removed the S-tests-failed label Jun 11, 2018

SimonSapin force-pushed the crossbeam-channel branch from d0bd3e7 to cf1acd6 Compare June 11, 2018 21:39

bors-servo pushed a commit that referenced this pull request Jun 11, 2018

Auto merge of #183 - servo:crossbeam-channel, r=<try>

9950293

Switch to crossbeam-channel Code changes by @stjepang. CC servo/servo#19515

gterzian mentioned this pull request Aug 3, 2018

Replace mpsc with crossbeam-channel servo/servo#21325

Merged

highfive added S-awaiting-merge and removed S-awaiting-review labels Aug 9, 2018

bors-servo pushed a commit that referenced this pull request Aug 9, 2018

Auto merge of #183 - servo:crossbeam-channel, r=SimonSapin+stjepang

17c4e26

Switch to crossbeam-channel Code changes by @stjepang. CC servo/servo#19515

highfive assigned SimonSapin Aug 9, 2018

bors-servo merged commit 614e4c9 into master Aug 9, 2018

highfive removed the S-awaiting-merge label Aug 9, 2018

This was referenced Aug 9, 2018

[WIP] Add native Windows back-end #166

Closed

Add docs to ipc #153

Merged

SimonSapin deleted the crossbeam-channel branch August 9, 2018 17:50

jdm mentioned this pull request Aug 15, 2018

[WIP] Update WR (various optimizations, color image support). servo/servo#21412

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Switch to crossbeam-channel #183

Switch to crossbeam-channel #183

SimonSapin commented Dec 18, 2017

antrik left a comment

antrik Dec 18, 2017

ghost Dec 18, 2017

antrik Dec 18, 2017

ghost Dec 18, 2017

antrik Dec 18, 2017

antrik Dec 18, 2017

ghost Dec 18, 2017

antrik Dec 18, 2017

antrik Dec 18, 2017

antrik Dec 18, 2017

ghost Dec 18, 2017 •

edited by ghost

Loading

SimonSapin Dec 18, 2017

ghost commented Dec 18, 2017

bors-servo commented Feb 15, 2018

SimonSapin commented Jun 11, 2018

bors-servo commented Jun 11, 2018

bors-servo commented Jun 11, 2018

SimonSapin commented Jun 11, 2018

bors-servo commented Jun 11, 2018

bors-servo commented Jun 11, 2018

SimonSapin commented Jun 11, 2018

bors-servo commented Jun 11, 2018

bors-servo commented Jun 11, 2018

bors-servo commented Aug 9, 2018

bors-servo commented Aug 9, 2018

Switch to crossbeam-channel #183

Switch to crossbeam-channel #183

Conversation

SimonSapin commented Dec 18, 2017

antrik left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ghost Dec 18, 2017 • edited by ghost Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ghost commented Dec 18, 2017

bors-servo commented Feb 15, 2018

SimonSapin commented Jun 11, 2018

bors-servo commented Jun 11, 2018

bors-servo commented Jun 11, 2018

SimonSapin commented Jun 11, 2018

bors-servo commented Jun 11, 2018

bors-servo commented Jun 11, 2018

SimonSapin commented Jun 11, 2018

bors-servo commented Jun 11, 2018

bors-servo commented Jun 11, 2018

bors-servo commented Aug 9, 2018

bors-servo commented Aug 9, 2018

ghost Dec 18, 2017 •

edited by ghost

Loading