Skip to content
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

Remove lock wrappers in sys_common #103150

Merged
merged 4 commits into from
Nov 12, 2022
Merged

Conversation

joboet
Copy link
Member

@joboet joboet commented Oct 17, 2022

This moves the lazy allocation to sys (SGX and UNIX). While this leads to a bit more verbosity, it will simplify future improvements by making room in sys_common for platform-independent implementations.

This also removes the condvar check on SGX as it is not necessary for soundness and will be removed anyway once mutex has been made movable.

For simplicity's sake, libunwind also uses lazy allocation now on SGX. This will require an update to the C definitions before merging this (CC @raoulstrackx).

r? @m-ou-se

@rustbot rustbot added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Oct 17, 2022
@rustbot
Copy link
Collaborator

rustbot commented Oct 17, 2022

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 17, 2022
@joboet joboet force-pushed the remove_lock_wrappers branch 2 times, most recently from 5186a11 to e9ceb57 Compare October 18, 2022 12:03
@m-ou-se
Copy link
Member

m-ou-se commented Oct 18, 2022

Nice! This is great. I haven't finished reviewing the diff yet, but I'm really happy to finally get the lock wrappers in sys_common removed.

@m-ou-se
Copy link
Member

m-ou-se commented Nov 5, 2022

Thank you!

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Nov 5, 2022

📌 Commit d57bb300e78058bc02965f582a4cb3acd7a48d31 has been approved by m-ou-se

It is now in the queue for this repository.

@bors 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 Nov 5, 2022
@joboet
Copy link
Member Author

joboet commented Nov 5, 2022

@bors r-
I think the SGX fork of libunwind needs to be updated first.

@bors 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 Nov 5, 2022
@joboet
Copy link
Member Author

joboet commented Nov 6, 2022

@m-ou-se this should be good to go now. Thank you for the review!

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 6, 2022
@m-ou-se
Copy link
Member

m-ou-se commented Nov 6, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Nov 6, 2022

📌 Commit 168f1f1 has been approved by m-ou-se

It is now in the queue for this repository.

@bors 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 Nov 6, 2022
@rust-log-analyzer

This comment has been minimized.

@joboet
Copy link
Member Author

joboet commented Nov 10, 2022

@m-ou-se Could you try again?

@m-ou-se
Copy link
Member

m-ou-se commented Nov 10, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Nov 10, 2022

📌 Commit 3e35cfb4b9f08090ed9959f3337cae53b39de32c has been approved by m-ou-se

It is now in the queue for this repository.

@bors 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 Nov 10, 2022
@bors
Copy link
Contributor

bors commented Nov 10, 2022

⌛ Testing commit 3e35cfb4b9f08090ed9959f3337cae53b39de32c with merge dd7fc2725173977b5a742999700146c50530b659...

@bors
Copy link
Contributor

bors commented Nov 10, 2022

💔 Test failed - checks-actions

@bors 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 Nov 10, 2022
@rust-log-analyzer

This comment has been minimized.

@joboet
Copy link
Member Author

joboet commented Nov 10, 2022

Sorry for taking up so much time; I didn't read the error messages carefully enough (twice 🤦).
@m-ou-se could we try it once more, please?

@m-ou-se
Copy link
Member

m-ou-se commented Nov 11, 2022

No worries. :)

@bors r+

@bors
Copy link
Contributor

bors commented Nov 11, 2022

📌 Commit f30614a has been approved by m-ou-se

It is now in the queue for this repository.

@bors 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 Nov 11, 2022
@bors
Copy link
Contributor

bors commented Nov 12, 2022

⌛ Testing commit f30614a with merge b0c6527...

@bors
Copy link
Contributor

bors commented Nov 12, 2022

☀️ Test successful - checks-actions
Approved by: m-ou-se
Pushing b0c6527 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 12, 2022
@bors bors merged commit b0c6527 into rust-lang:master Nov 12, 2022
@rustbot rustbot added this to the 1.67.0 milestone Nov 12, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (b0c6527): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
0.1% [0.1%, 0.1%] 1
Regressions ❌
(secondary)
2.1% [2.1%, 2.1%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.1% [0.1%, 0.1%] 1

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
2.2% [2.2%, 2.2%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Aaron1011 pushed a commit to Aaron1011/rust that referenced this pull request Jan 6, 2023
Remove lock wrappers in `sys_common`

This moves the lazy allocation to `sys` (SGX and UNIX). While this leads to a bit more verbosity, it will simplify future improvements by making room in `sys_common` for platform-independent implementations.

This also removes the condvar check on SGX as it is not necessary for soundness and will be removed anyway once mutex has been made movable.

For simplicity's sake, `libunwind` also uses lazy allocation now on SGX. This will require an update to the C definitions before merging this (CC `@raoulstrackx).`

r? `@m-ou-se`
@joboet joboet deleted the remove_lock_wrappers branch July 6, 2023 13:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants