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

Fix windows support #99

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open

Fix windows support #99

wants to merge 13 commits into from

Conversation

roblabla
Copy link

@roblabla roblabla commented Aug 2, 2024

The windows targets weren't working at all for me:

  1. The wrong target was being used. i686-pc-win32 doesn't exist as far as jemalloc's build system is concerned, only i686-pc-mingw32 does (and if jemalloc detects the compiler is MSVC, it will automatically switch to an MSVC-based build).
  2. The library wasn't getting found, because it was called jemalloc_s instead of just jemalloc
  3. The unprefixed_on_supported_target feature was broken because jemalloc automatically prefixes macos and windows targets for some reason.

Finally, I also added support for the win7 target, which is a tier3 target supporting windows 7.

Note that this is tested manually on my end using a bit of a bespoke cross-compilation toolchain. The crate doesn't successfully build on a more "normal" toolchain due to autoconf failing to build when the compiler path contains spaces. I'd like to add a CI, but I'd need to first need to find a way to fix that issue...

To successfully build jemalloc for msvc-windows, we need to pretend
we're doing a mingw build. The configure script will then check if the
compiler is actually an MSVC compiler (by checking if it defines
_MSC_VER), and if so switch to an MSVC build (which enables a bunch of
compatibility hacks, such as removing the need for pthread).

Signed-off-by: roblabla <unfiltered@roblab.la>
On windows, the generated library is called jemalloc_s instead of
jemalloc_pic.

Signed-off-by: roblabla <unfiltered@roblab.la>
Signed-off-by: roblabla <unfiltered@roblab.la>
It turns out, jemalloc doesn't support having unprefixed malloc on these
targets. When --with-jemalloc-prefix is not specified, jemalloc will
implicitly add a `je_` prefix regardless.

Signed-off-by: roblabla <unfiltered@roblab.la>
@BusyJay
Copy link
Member

BusyJay commented Aug 2, 2024

Interesting, you can also update the action files to add windows target and prove it works.

@roblabla
Copy link
Author

roblabla commented Aug 2, 2024

So as I said, I have a bit of a weird setup where I use a cross-compiling toolchain to build the crate, and that works.

However, when I tried to add it in CI, but doing the naive thing of just running cargo test in a windows runner doesn't work, because it tries to run with CC=C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.40.33807\bin\HostX64\x64\cl.exe, and that doesn't work because of the space in the "Program Files". See https://github.com/JustRustThings/jemallocator/actions/runs/10164835677/job/28111216397

This might be fixable by entering a visual studio shell so the cl.exe program is in the PATH. I'll give it a try.

@BusyJay
Copy link
Member

BusyJay commented Aug 3, 2024

I don't think space in path is the problem.

checking for x86_64-pc-mingw32-gcc... C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.40.33807\bin\HostX64\x64\cl.exe

The line shows that full compiler path is used. However the target it tries doesn't match the compiler it uses.

@roblabla
Copy link
Author

roblabla commented Aug 3, 2024

The space is absolutely the problem, but the logs don't show it clearly. If I run the build locally on a windows vm and check the config.log, it has an error to the tune of "C:\Program: no such file or directory", which stops the build.

Autoconf does not support spaces in the compiler path. It's a rather well-known problem. I just had a pretty solid idea to avoid it though: I can use the short path syntax (c:\progra~2) to avoid the space 👀.

The target is not wrong. As I explain in the post, the way you do an msvc build with jemalloc is by building for mingw/cygwin with an msvc compiler in CC. The autoconf script will detect that and set use_msvc to yes, at which point the msvc codepaths will be used.

let path = match Command::new("cmd").args(["/c", "@echo %~s1"]).arg(orig_path).output() {
Ok(v) if v.status.success() => v.stdout,
Ok(v) => {
warning!("Failed to expand {} to a short path, the command exited with status {}", orig_path.display(), v.status);
Copy link
Member

Choose a reason for hiding this comment

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

stderr can also be printed.

@@ -9,13 +9,19 @@ on:
branches:
- 'master'
- 'main'
- 'windows-support'
Copy link
Member

Choose a reason for hiding this comment

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

Should be deleted before being merged.

// PathBuf.
let path = match String::from_utf8(path) {
Ok(v) => v,
Err(_err) => {
Copy link
Member

Choose a reason for hiding this comment

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

Should use _ instead.

@roblabla roblabla force-pushed the windows-support branch 16 times, most recently from 0d52502 to be3cb2b Compare August 4, 2024 15:02
Autoconf does not support spaces in the compiler path. This is not
usually a problem, as on most platforms, the compiler will reside in a
path without spaces (such as /usr/bin or /opt). However, on windows, the
MSVC compiler is usually found under C:\Program Files, which causes all
hell to break loose.

Thankfully, windows has something called "Short Paths", which we can use
to turn C:\Program Files into C:\PROGRA~2, eliminating the path.

If the build script detects the compiler path has a space, and is
running on windows, it will attempt to turn the path into a short path
and run with this.
@roblabla roblabla force-pushed the windows-support branch 2 times, most recently from 8c73dde to 85913f9 Compare August 4, 2024 15:59
@roblabla roblabla force-pushed the windows-support branch 3 times, most recently from f4a03db to 4ec1604 Compare August 5, 2024 15:08
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.

2 participants