Skip to content

Work around Wine bug 60084 by calling WSAStartup at most once - #160134

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
tbu-:pr_wine_60084_wsastartup
Jul 30, 2026
Merged

Work around Wine bug 60084 by calling WSAStartup at most once#160134
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
tbu-:pr_wine_60084_wsastartup

Conversation

@tbu-

@tbu- tbu- commented Jul 29, 2026

Copy link
Copy Markdown
Contributor

CC Wine bug 60084
CC tokio-rs/mio#1980

Wine's WSAStartup/WSACleanup are currently not thread-safe (though they probably should be, which is why I reported an upstream bug).

Before #141809 (and Rust 1.90), Rust used to call WSAStartup at most once. This PR restores that behavior.

I believe that this is not a regression for real Windows, since the hot path of a Once already having executed is well-optimized, it's just one atomic load, like before.

@rustbot rustbot added O-windows Operating system: Windows S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jul 29, 2026
@rustbot

rustbot commented Jul 29, 2026

Copy link
Copy Markdown
Collaborator

ChrisDenton is not on the review rotation at the moment.
They may take a while to respond.

@rustbot

rustbot commented Jul 29, 2026

Copy link
Copy Markdown
Collaborator

r? @ChrisDenton

rustbot has assigned @ChrisDenton.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Why was this reviewer chosen?

The reviewer was selected based on:

  • Owners of files modified in this PR: @ChrisDenton

@tbu- tbu- mentioned this pull request Jul 29, 2026
Open
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@tbu-
tbu- force-pushed the pr_wine_60084_wsastartup branch from 67cec28 to a098607 Compare July 29, 2026 09:39
@ChrisDenton

ChrisDenton commented Jul 29, 2026

Copy link
Copy Markdown
Member

Could you add a comment mentioning the WINE bug?

@tbu-
Work around Wine bug 60084 by calling WSAStartup at most once
50d66b9 
CC [Wine bug 60084](https://bugs.winehq.org/show_bug.cgi?id=60084)
CC tokio-rs/mio#1980

Wine's `WSAStartup`/`WSACleanup` are currently not thread-safe (though
they probably should be, which is why I reported an upstream bug).

Before rust-lang#141809 (and Rust 1.90),
Rust used to call `WSAStartup` at most once. This PR restores that
behavior.

I believe that this is not a regression for real Windows, since the hot
path of a `Once` already having executed is well-optimized, it's just
one atomic load, like before.
@tbu-
tbu- force-pushed the pr_wine_60084_wsastartup branch from a098607 to 50d66b9 Compare July 29, 2026 11:56
@tbu-

tbu- commented Jul 29, 2026

Copy link
Copy Markdown
Contributor Author

Done.

@ChrisDenton

ChrisDenton commented Jul 29, 2026

Copy link
Copy Markdown
Member

Thanks!

@bors r+ rollup

@rust-bors

rust-bors Bot commented Jul 29, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 50d66b9 has been approved by ChrisDenton

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 Jul 29, 2026
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Jul 29, 2026
@JonathanBrouwer
Rollup merge of rust-lang#160134 - tbu-:pr_wine_60084_wsastartup, r=C…
078e630 
…hrisDenton

Work around Wine bug 60084 by calling WSAStartup at most once

CC [Wine bug 60084](https://bugs.winehq.org/show_bug.cgi?id=60084)
CC tokio-rs/mio#1980

Wine's `WSAStartup`/`WSACleanup` are currently not thread-safe (though they probably should be, which is why I reported an upstream bug).

Before rust-lang#141809 (and Rust 1.90), Rust used to call `WSAStartup` at most once. This PR restores that behavior.

I believe that this is not a regression for real Windows, since the hot path of a `Once` already having executed is well-optimized, it's just one atomic load, like before.
@JonathanBrouwer JonathanBrouwer mentioned this pull request Jul 29, 2026
Closed
jhpratt added a commit to jhpratt/rust that referenced this pull request Jul 29, 2026
@jhpratt
Rollup merge of rust-lang#160134 - tbu-:pr_wine_60084_wsastartup, r=C…
3e3f38e 
…hrisDenton

Work around Wine bug 60084 by calling WSAStartup at most once

CC [Wine bug 60084](https://bugs.winehq.org/show_bug.cgi?id=60084)
CC tokio-rs/mio#1980

Wine's `WSAStartup`/`WSACleanup` are currently not thread-safe (though they probably should be, which is why I reported an upstream bug).

Before rust-lang#141809 (and Rust 1.90), Rust used to call `WSAStartup` at most once. This PR restores that behavior.

I believe that this is not a regression for real Windows, since the hot path of a `Once` already having executed is well-optimized, it's just one atomic load, like before.
@jhpratt jhpratt mentioned this pull request Jul 29, 2026
Closed
rust-bors Bot pushed a commit that referenced this pull request Jul 29, 2026
@bors
Auto merge of #160168 - jhpratt:rollup-I0uRmMW, r=jhpratt
82dec74 
Rollup of 17 pull requests

Successful merges:

 - #159014 ([rustdoc] Do not take `doc(cfg())` into account when filtering doctests)
 - #159130 (a bit optimize four-digit chunks in integer formatting)
 - #159592 (core: implement bounded random sampling)
 - #159898 (Add intrinsic-test alias and set  sample rate)
 - #158247 (hermit/fs: Return `unsupported()` instead of `from_raw_os_error(22)`)
 - #158649 (Hermit: fix `readdir()` )
 - #159049 (Avoid ICE in From/TryFrom cast suggestion when encountering HRTBs)
 - #160053 (test: add test suite for the 85681 issue)
 - #160087 (Add regression test for nested associated-type projection ICE)
 - #160090 (rustc_resolve: Further reduce mutability in resolver)
 - #160099 (Resolver: split module resolutions into local and external resolutions)
 - #160106 (Add suggestions for `must_implement_one_of`)
 - #160117 (Remove unnecessary format usage)
 - #160134 (Work around Wine bug 60084 by calling WSAStartup at most once)
 - #160142 (bootstrap: remove use-lld config alias)
 - #160148 (Rename `errors.rs` file to `diagnostics.rs` (15/N))
 - #160151 (Mark a doctest as requiring unwinding)
jhpratt added a commit to jhpratt/rust that referenced this pull request Jul 29, 2026
@jhpratt
Rollup merge of rust-lang#160134 - tbu-:pr_wine_60084_wsastartup, r=C…
0b2c1e9 
…hrisDenton

Work around Wine bug 60084 by calling WSAStartup at most once

CC [Wine bug 60084](https://bugs.winehq.org/show_bug.cgi?id=60084)
CC tokio-rs/mio#1980

Wine's `WSAStartup`/`WSACleanup` are currently not thread-safe (though they probably should be, which is why I reported an upstream bug).

Before rust-lang#141809 (and Rust 1.90), Rust used to call `WSAStartup` at most once. This PR restores that behavior.

I believe that this is not a regression for real Windows, since the hot path of a `Once` already having executed is well-optimized, it's just one atomic load, like before.
@jhpratt jhpratt mentioned this pull request Jul 29, 2026
Closed
rust-bors Bot pushed a commit that referenced this pull request Jul 29, 2026
@bors
Auto merge of #160174 - jhpratt:rollup-2pBeTwD, r=jhpratt
a981d4b 
Rollup of 18 pull requests

Successful merges:

 - #159130 (a bit optimize four-digit chunks in integer formatting)
 - #159592 (core: implement bounded random sampling)
 - #159898 (Add intrinsic-test alias and set  sample rate)
 - #158247 (hermit/fs: Return `unsupported()` instead of `from_raw_os_error(22)`)
 - #158649 (Hermit: fix `readdir()` )
 - #159049 (Avoid ICE in From/TryFrom cast suggestion when encountering HRTBs)
 - #160053 (test: add test suite for the 85681 issue)
 - #160087 (Add regression test for nested associated-type projection ICE)
 - #160090 (rustc_resolve: Further reduce mutability in resolver)
 - #160099 (Resolver: split module resolutions into local and external resolutions)
 - #160106 (Add suggestions for `must_implement_one_of`)
 - #160117 (Remove unnecessary format usage)
 - #160134 (Work around Wine bug 60084 by calling WSAStartup at most once)
 - #160139 (iter: specialize Take::count using advance_by)
 - #160142 (bootstrap: remove use-lld config alias)
 - #160148 (Rename `errors.rs` file to `diagnostics.rs` (15/N))
 - #160151 (Mark a doctest as requiring unwinding)
 - #160166 (Use correct feature gates for `f16`/`f128` `From` impls)
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Jul 29, 2026
@JonathanBrouwer
Rollup merge of rust-lang#160134 - tbu-:pr_wine_60084_wsastartup, r=C…
386cfc0 
…hrisDenton

Work around Wine bug 60084 by calling WSAStartup at most once

CC [Wine bug 60084](https://bugs.winehq.org/show_bug.cgi?id=60084)
CC tokio-rs/mio#1980

Wine's `WSAStartup`/`WSACleanup` are currently not thread-safe (though they probably should be, which is why I reported an upstream bug).

Before rust-lang#141809 (and Rust 1.90), Rust used to call `WSAStartup` at most once. This PR restores that behavior.

I believe that this is not a regression for real Windows, since the hot path of a `Once` already having executed is well-optimized, it's just one atomic load, like before.
@JonathanBrouwer JonathanBrouwer mentioned this pull request Jul 29, 2026
Closed
rust-bors Bot pushed a commit that referenced this pull request Jul 29, 2026
@bors
Auto merge of #160182 - JonathanBrouwer:rollup-5J0H0ej, r=JonathanBro…
aac6f26 
…uwer

Rollup of 18 pull requests

Successful merges:

 - #159898 (Add intrinsic-test alias and set  sample rate)
 - #158247 (hermit/fs: Return `unsupported()` instead of `from_raw_os_error(22)`)
 - #158649 (Hermit: fix `readdir()` )
 - #158693 (Add type-check to offload intrinisc calls)
 - #159049 (Avoid ICE in From/TryFrom cast suggestion when encountering HRTBs)
 - #159411 ([rustdoc] Correctly handle output options with --show-coverage)
 - #160053 (test: add test suite for the 85681 issue)
 - #160087 (Add regression test for nested associated-type projection ICE)
 - #160090 (rustc_resolve: Further reduce mutability in resolver)
 - #160099 (Resolver: split module resolutions into local and external resolutions)
 - #160106 (Add suggestions for `must_implement_one_of`)
 - #160117 (Remove unnecessary format usage)
 - #160134 (Work around Wine bug 60084 by calling WSAStartup at most once)
 - #160139 (iter: specialize Take::count using advance_by)
 - #160142 (bootstrap: remove use-lld config alias)
 - #160148 (Rename `errors.rs` file to `diagnostics.rs` (15/N))
 - #160151 (Mark a doctest as requiring unwinding)
 - #160166 (Use correct feature gates for `f16`/`f128` `From` impls)
@jhpratt jhpratt mentioned this pull request Jul 30, 2026
Merged
rust-bors Bot pushed a commit that referenced this pull request Jul 30, 2026
@bors
Auto merge of #160190 - jhpratt:rollup-5Fioy6q, r=jhpratt
d108471 
Rollup of 20 pull requests

Successful merges:

 - #157669 (cfi: add diag mode support)
 - #158247 (hermit/fs: Return `unsupported()` instead of `from_raw_os_error(22)`)
 - #158649 (Hermit: fix `readdir()` )
 - #158693 (Add type-check to offload intrinisc calls)
 - #159049 (Avoid ICE in From/TryFrom cast suggestion when encountering HRTBs)
 - #159411 ([rustdoc] Correctly handle output options with --show-coverage)
 - #160053 (test: add test suite for the 85681 issue)
 - #160087 (Add regression test for nested associated-type projection ICE)
 - #160090 (rustc_resolve: Further reduce mutability in resolver)
 - #160099 (Resolver: split module resolutions into local and external resolutions)
 - #160101 (Add missing `needs-unwind` annotation to `add-spawn-hook-reentrancy-159923` test)
 - #160106 (Add suggestions for `must_implement_one_of`)
 - #160117 (Remove unnecessary format usage)
 - #160134 (Work around Wine bug 60084 by calling WSAStartup at most once)
 - #160139 (iter: specialize Take::count using advance_by)
 - #160142 (bootstrap: remove use-lld config alias)
 - #160148 (Rename `errors.rs` file to `diagnostics.rs` (15/N))
 - #160151 (Mark a doctest as requiring unwinding)
 - #160166 (Use correct feature gates for `f16`/`f128` `From` impls)
 - #160178 (Remove unused `va_start` intrinsic)
rust-bors Bot pushed a commit that referenced this pull request Jul 30, 2026
@bors
Auto merge of #160190 - jhpratt:rollup-5Fioy6q, r=jhpratt
be3d26d 
Rollup of 20 pull requests

Successful merges:

 - #157669 (cfi: add diag mode support)
 - #158247 (hermit/fs: Return `unsupported()` instead of `from_raw_os_error(22)`)
 - #158649 (Hermit: fix `readdir()` )
 - #158693 (Add type-check to offload intrinisc calls)
 - #159049 (Avoid ICE in From/TryFrom cast suggestion when encountering HRTBs)
 - #159411 ([rustdoc] Correctly handle output options with --show-coverage)
 - #160053 (test: add test suite for the 85681 issue)
 - #160087 (Add regression test for nested associated-type projection ICE)
 - #160090 (rustc_resolve: Further reduce mutability in resolver)
 - #160099 (Resolver: split module resolutions into local and external resolutions)
 - #160101 (Add missing `needs-unwind` annotation to `add-spawn-hook-reentrancy-159923` test)
 - #160106 (Add suggestions for `must_implement_one_of`)
 - #160117 (Remove unnecessary format usage)
 - #160134 (Work around Wine bug 60084 by calling WSAStartup at most once)
 - #160139 (iter: specialize Take::count using advance_by)
 - #160142 (bootstrap: remove use-lld config alias)
 - #160148 (Rename `errors.rs` file to `diagnostics.rs` (15/N))
 - #160151 (Mark a doctest as requiring unwinding)
 - #160166 (Use correct feature gates for `f16`/`f128` `From` impls)
 - #160178 (Remove unused `va_start` intrinsic)
@rust-bors
rust-bors Bot merged commit e13b684 into rust-lang:main Jul 30, 2026
13 checks passed
@rustbot rustbot added this to the 1.99.0 milestone Jul 30, 2026
rust-timer added a commit that referenced this pull request Jul 30, 2026
@rust-timer
Unrolled build for #160134
4d072f6 
Rollup merge of #160134 - tbu-:pr_wine_60084_wsastartup, r=ChrisDenton

Work around Wine bug 60084 by calling WSAStartup at most once

CC [Wine bug 60084](https://bugs.winehq.org/show_bug.cgi?id=60084)
CC tokio-rs/mio#1980

Wine's `WSAStartup`/`WSACleanup` are currently not thread-safe (though they probably should be, which is why I reported an upstream bug).

Before #141809 (and Rust 1.90), Rust used to call `WSAStartup` at most once. This PR restores that behavior.

I believe that this is not a regression for real Windows, since the hot path of a `Once` already having executed is well-optimized, it's just one atomic load, like before.
@tbu- tbu- mentioned this pull request Aug 3, 2026
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@ChrisDenton ChrisDenton

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.99.0

Development

Successfully merging this pull request may close these issues.

4 participants

@tbu- @rustbot @rust-log-analyzer @ChrisDenton