Skip to content

Introduce force-inprocess feature #92

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
Merged
merged 3 commits into from
Aug 29, 2016
Merged

Introduce force-inprocess feature #92

merged 3 commits into from
Aug 29, 2016

Conversation

nox
Copy link
Contributor

@nox nox commented Aug 2, 2016

No description provided.

@nox nox mentioned this pull request Aug 2, 2016
Merged
@bors-servo
Copy link
Contributor

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

@antrik
Copy link
Contributor

antrik commented Aug 10, 2016

What's up with this? Does the test failure point to an actual problem, or was that just some kind of Travis hiccup?...

@nox
Copy link
Contributor Author

nox commented Aug 10, 2016

@antrik Sounds like an actual failure:

fatal runtime error: out of memory
fatal runtime error: out of memory
fatal runtime error: out of memory
fatal runtime error: out of memory
fatal runtime error: out of memory
fatal runtime error: out of memory
fatal runtime error: out of memory
fatal runtime error: out of memory

Will rebase and retry.

@antrik
Copy link
Contributor

antrik commented Aug 20, 2016 •
edited
Loading

@nox oh, I see what happened there: the condition for the fragmenting tests at https://github.com/servo/ipc-channel/blob/master/src/platform/test.rs#L207 needs to be adapted too, so these tests only run when actually using the linux backend. They make no sense -- and won't work -- with backends not using fragmentation.

BTW, I wonder whether there is some way to determine the backend to use in a single place, and store this in some kind of config variable that is used throughout the library, rather than having system-specific conditionals everywhere? (If there isn't, I'd consider that a serious shortcoming in Rust/Cargo...)

@nox
Copy link
Contributor Author

nox commented Aug 20, 2016

@antrik Nice debugging, will disable these tests.

Manishearth
Manishearth reviewed Aug 24, 2016
View reviewed changes
src/test.rs
}

#[test]
///XXXjdm Windows' libc doesn't include fork.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keep the comment? r=me either way

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think keeping the comment would be confusing: the multi-process tests actually can't work / don't make sense on platforms using the inprocess implementation -- regardless of whether fork() is available or not.

@nox
Copy link
Contributor Author

nox commented Aug 24, 2016

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit 11615c3 has been approved by nox

@bors-servo
Copy link
Contributor

⌛ Testing commit 11615c3 with merge 055514f...

bors-servo pushed a commit that referenced this pull request Aug 24, 2016
Auto merge of #92 - nox:inprocess, r=nox
055514f 
Introduce force-inprocess feature
@nox
Copy link
Contributor Author

nox commented Aug 24, 2016

@bors-servo r-

@nox
Copy link
Contributor Author

nox commented Aug 24, 2016

@bors-servo r=Manishearth

@bors-servo
Copy link
Contributor

📌 Commit 11615c3 has been approved by Manishearth

@bors-servo
Copy link
Contributor

💔 Test failed - status-travis

@nox
Copy link
Contributor Author

nox commented Aug 24, 2016

@bors-servo r=Manishearth

@bors-servo
Copy link
Contributor

📌 Commit 02c7e75 has been approved by Manishearth

@bors-servo
Copy link
Contributor

⌛ Testing commit 02c7e75 with merge 345ff2e...

bors-servo pushed a commit that referenced this pull request Aug 24, 2016
Auto merge of #92 - nox:inprocess, r=Manishearth
345ff2e 
Introduce force-inprocess feature
@bors-servo
Copy link
Contributor

💔 Test failed - status-travis

@nox
Copy link
Contributor Author

nox commented Aug 24, 2016

@antrik Not running that test wasn't enough.

antrik
antrik reviewed Aug 24, 2016
View reviewed changes
src/platform/test.rs Outdated
let (mut received_data, received_channels, received_shared_memory_regions) =
super_rx.recv().unwrap();
// These tests only apply to platforms that need fragmentation.
#[cfg(all(not(feature = "inprocess"), target_os = "linux"))]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's force-inprocess, not just inprocess.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I'm silly, thanks.

nox added 3 commits August 25, 2016 11:15
@nox
Introduce force-inprocess feature
3e9aee8
@nox
Fix all import warnings
e7519f0
@nox
Make inprocess::OsIpcSender::to_sender take &mut self
4d0369c 
The other implementations take that, and the implementations should
behave consistently.
@antrik
Copy link
Contributor

antrik commented Aug 26, 2016

Looks good :-) As you added the warning clean-ups, I guess it needs a new r+? Or is the previous one sufficient to cover this?...

@nox
Copy link
Contributor Author

nox commented Aug 26, 2016

Just wanted you to take a last look. :)

@bors-servo r=antrik

@bors-servo
Copy link
Contributor

📌 Commit 4d0369c has been approved by antrik

@bors-servo
Copy link
Contributor

⌛ Testing commit 4d0369c with merge b48a8d3...

bors-servo pushed a commit that referenced this pull request Aug 26, 2016
Auto merge of #92 - nox:inprocess, r=antrik
b48a8d3 
Introduce force-inprocess feature
@bors-servo
Copy link
Contributor

💔 Test failed - status-appveyor

@nox
Copy link
Contributor Author

nox commented Aug 29, 2016

@bors-servo retry

@bors-servo
Copy link
Contributor

⌛ Testing commit 4d0369c with merge 3852245...

bors-servo pushed a commit that referenced this pull request Aug 29, 2016
Auto merge of #92 - nox:inprocess, r=antrik
3852245 
Introduce force-inprocess feature
@bors-servo
Copy link
Contributor

☀️ Test successful - status-appveyor, status-travis

@bors-servo bors-servo merged commit 4d0369c into servo:master Aug 29, 2016
This was referenced Aug 29, 2016
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@nox @bors-servo @antrik @Manishearth