Skip to content

Add a couple pthread function definitions and get_sched for musl. #1146

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.

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

Merged
merged 2 commits into from
Nov 27, 2018

Conversation

mwanner
Copy link
Contributor

@mwanner mwanner commented Nov 23, 2018

I missed pthread_setaffinity_np for the musl variant, so I added a few missing function declarations for musl.

@rust-highfive
Copy link

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

@alexcrichton
Copy link
Member

Thanks! Looks like there's some errors on CI though?

@mwanner
Copy link
Contributor Author

mwanner commented Nov 23, 2018

Thanks! Looks like there's some errors on CI though?

Hm.. interesting, test coverage without writing a test. Nice.

How do I run these tests locally? Fails for me due to not finding linux/input.h (for target x86_64-unknown-linux-musl) or linux/module.h (against default system glibc).

@gnzlbg
Copy link
Contributor

gnzlbg commented Nov 23, 2018 via email

@gnzlbg
Copy link
Contributor

gnzlbg commented Nov 24, 2018

@bors: r+

@bors
Copy link
Contributor

bors commented Nov 24, 2018

📌 Commit ac2cfa7 has been approved by gnzlbg

@bors
Copy link
Contributor

bors commented Nov 24, 2018

⌛ Testing commit ac2cfa7 with merge 785e007...

bors added a commit that referenced this pull request Nov 24, 2018
Add a couple pthread function definitions and get_sched for musl.

I missed `pthread_setaffinity_np` for the musl variant, so I added a few missing function declarations for musl.
@bors
Copy link
Contributor

bors commented Nov 24, 2018

💔 Test failed - status-travis

@mwanner
Copy link
Contributor Author

mwanner commented Nov 24, 2018

You need to use the docket containers, check .travis.yml for how the run_docker script is called.

Ah, thanks, I'll try that.

@gnzlbg
Copy link
Contributor

gnzlbg commented Nov 24, 2018

@bors: retry

@bors
Copy link
Contributor

bors commented Nov 24, 2018

⌛ Testing commit ac2cfa7 with merge 14dab7f...

bors added a commit that referenced this pull request Nov 24, 2018
Add a couple pthread function definitions and get_sched for musl.

I missed `pthread_setaffinity_np` for the musl variant, so I added a few missing function declarations for musl.
@bors
Copy link
Contributor

bors commented Nov 24, 2018

💔 Test failed - status-travis

@mwanner mwanner force-pushed the musl-pthread-affinity branch from ac2cfa7 to 268a282 Compare November 26, 2018 15:20
@mwanner
Copy link
Contributor Author

mwanner commented Nov 26, 2018

Thanks! Looks like there's some errors on CI though?

I dropped the definitions for functions that musl really doesn't provide, squashed the two commits and rebased onto master. This seems to pass CI just fine, now. Please have another look.

@gnzlbg
Copy link
Contributor

gnzlbg commented Nov 26, 2018

Looks like you've rebased one commit too much :/

Otherwise LGTM. @alexcrichton this can be merged as is, but maybe the commit should be cherry picked on top of master to avoid modifying the history.

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Nov 26, 2018

📌 Commit 268a282 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Nov 26, 2018

⌛ Testing commit 268a282 with merge 1549531...

bors added a commit that referenced this pull request Nov 26, 2018
Add a couple pthread function definitions and get_sched for musl.

I missed `pthread_setaffinity_np` for the musl variant, so I added a few missing function declarations for musl.
@bors
Copy link
Contributor

bors commented Nov 26, 2018

💔 Test failed - status-travis

@alexcrichton
Copy link
Member

@bors: retry

@bors
Copy link
Contributor

bors commented Nov 27, 2018

⌛ Testing commit 268a282 with merge 596ba58...

bors added a commit that referenced this pull request Nov 27, 2018
Add a couple pthread function definitions and get_sched for musl.

I missed `pthread_setaffinity_np` for the musl variant, so I added a few missing function declarations for musl.
@bors
Copy link
Contributor

bors commented Nov 27, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 596ba58 to master...

@bors bors merged commit 268a282 into rust-lang:master Nov 27, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants