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.

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

Windows: Load synch functions together #100710

Merged
merged 3 commits into from
Aug 20, 2022
Merged

Windows: Load synch functions together #100710

merged 3 commits into from
Aug 20, 2022

Conversation

ChrisDenton
Copy link
Member

Attempt to load all the required sync functions and fail if any one of them fails.

This fixes a FIXME by going back to optional loading of WakeByAddressSingle.

Also reintroduces a macro for optional loading of functions but keeps it separate from the fallback macro rather than having that do two different jobs.

r? @thomcc

@ChrisDenton
Windows: Load synch functions together
b631ca0 
Attempt to load all the required sync functions and fail if any one of them fails.

This reintroduces a macro for optional loading of functions but keeps it separate from the fallback macro rather than having that do two different jobs.
@rustbot rustbot added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Aug 18, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 18, 2022
@ChrisDenton ChrisDenton marked this pull request as ready for review August 18, 2022 06:45
@rustbot
Copy link
Collaborator

rustbot commented Aug 18, 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

@ChrisDenton ChrisDenton added the O-windows Operating system: Windows label Aug 18, 2022
thomcc
thomcc reviewed Aug 18, 2022
View reviewed changes
library/std/src/sys/windows/compat.rs Outdated Show resolved Hide resolved
library/std/src/sys/windows/compat.rs
///
/// The module must not be unloaded.
pub unsafe fn load_system_library(name: &CStr) -> Option<Self> {
let module = c::LoadLibraryExA(
Copy link
Member

Choose a reason for hiding this comment

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

So previously we loaded this via GetModuleHandle no? Is there a reason to change? IIUC this one is UB (well, deadlock in practice) to call with the loader lock held, which is slightly unfortunate.

Copy link
Member

Choose a reason for hiding this comment

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

(That said if theres a reason to use this instead, that's probably fine)

Copy link
Member Author

Choose a reason for hiding this comment

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

I was looking into #78444 and yeah, it should properly be LoadLibrary because the only two dlls that are guaranteed loaded are ntdll and kernel32. But then again "api-ms-win-core-synch-l1-2-0" is a kind of a virtual dll that may resolve to kernel32 anyway (or might not).

My thought was it shouldn't be too much of an issue in practice considering that using synchronization while the loader lock is held is already very sketchy and that in practice the required module will (hopefully) already be loaded.

That said, I'd be ok with reverting this part if it's too controversial.

Copy link
Member

Choose a reason for hiding this comment

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

Hm, fair enough, I think we can keep it as is and see if anybody ends up complaining. This should only be triggered (I think) if people actually need to block, anyway.

@thomcc
Copy link
Member

thomcc commented Aug 18, 2022

LGTM

@bors r+

@bors
Copy link
Contributor

bors commented Aug 18, 2022

📌 Commit eb54b93fd4c937f1326237feb28edaff8cedcef9 has been approved by thomcc

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 Aug 18, 2022
@ChrisDenton
Copy link
Member Author

@bors r- fixing a mistake

@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 Aug 20, 2022
@ChrisDenton
Copy link
Member Author

@bors r=thomcc

@bors
Copy link
Contributor

bors commented Aug 20, 2022

📌 Commit 625e7e9 has been approved by thomcc

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 20, 2022
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 20, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 20, 2022
@bors
Auto merge of rust-lang#100809 - matthiaskrgr:rollup-xkpd5ii, r=matth…
48853a3 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#99415 (Initial implementation of REUSE)
 - rust-lang#99544 (Expose `Utf8Lossy` as `Utf8Chunks`)
 - rust-lang#100585 (Fix trailing space showing up in example)
 - rust-lang#100596 (Remove unnecessary stderr files)
 - rust-lang#100642 (Update fortanix-sgx-abi and export some useful SGX usercall traits)
 - rust-lang#100691 (Make `same_type_modulo_infer` a proper `TypeRelation`)
 - rust-lang#100693 (Add LLVM15-specific codegen test for `try`/`?`s that now optimize away)
 - rust-lang#100710 (Windows: Load synch functions together)
 - rust-lang#100807 (Add TaKO8Ki to translation-related mention groups)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 77db317 into rust-lang:master Aug 20, 2022
@rustbot rustbot added this to the 1.65.0 milestone Aug 20, 2022
@ChrisDenton ChrisDenton deleted the load-library branch August 20, 2022 20:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thomcc thomcc thomcc left review comments

Assignees

@thomcc thomcc

Labels
O-windows Operating system: Windows 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
Milestone
1.65.0
Development

Successfully merging this pull request may close these issues.
5 participants
@ChrisDenton @rustbot @thomcc @bors @rust-highfive