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

pthreads link fix #13

Merged
merged 3 commits into from
Jun 19, 2021
Merged

pthreads link fix #13

merged 3 commits into from
Jun 19, 2021

Conversation

daschuer
Copy link
Member

This includes the microsoft#17011
Which might fix the Debug build of Mixxx

@daschuer daschuer force-pushed the pthreads_linkage branch 4 times, most recently from 3f6a2f4 to 4fc035e Compare June 17, 2021 07:03
@daschuer daschuer changed the title Added upstream pthreads port as overlay to fix the linkage pthreads link fix Jun 17, 2021
@JoergAtGithub
Copy link
Member

I just tried the artifact you provided in zulip - unfortunately the pthread behavior is the same as before.

@daschuer
Copy link
Member Author

Thank you for checking. Please post the cmake configure log output. I am especially interested in the lines around:

-- Found PThreads4W: optimized;C:/buildenv/mixxx-dependencies-2.3-x64-windows-3d70970e752542db9901e4aa2656f215699dc102/installed/x64-windows/lib/pthreadVC3.lib;debug;C:/buildenv/mixxx-dependencies-2.3-x64-windows-3d70970e752542db9901e4aa2656f215699dc102/installed/x64-windows/debug/lib/pthreadVC3d.lib  
-- PThreads4W_DLL_DIR: C:/buildenv/mixxx-dependencies-2.3-x64-windows-3d70970e752542db9901e4aa2656f215699dc102/installed/x64-windows/include/../bin

doe the paths exists?

@JoergAtGithub
Copy link
Member

Debug x64_off:

1> [CMake] -- Found lilv: C:/Users/Joerg/source/repos/JoergAtGithub/mixxx/buildenv/mixxx-deps-2.3-x64-windows-8f55ca2/installed/x64-windows/debug/lib/lilv.lib  
1> [CMake] -- Could NOT find Shoutidjc (missing: Shoutidjc_LIBRARY Shoutidjc_INCLUDE_DIR) 
1> [CMake] -- Using internal libshout-idjc
1> [CMake] -- Found PThreads4W: optimized;C:/Users/Joerg/source/repos/JoergAtGithub/mixxx/buildenv/mixxx-deps-2.3-x64-windows-8f55ca2/installed/x64-windows/lib/pthreadVC3.lib;debug;C:/Users/Joerg/source/repos/JoergAtGithub/mixxx/buildenv/mixxx-deps-2.3-x64-windows-8f55ca2/installed/x64-windows/debug/lib/pthreadVC3d.lib  
1> [CMake] -- PThreads4W_DLL_DIR: C:/Users/Joerg/source/repos/JoergAtGithub/mixxx/buildenv/mixxx-deps-2.3-x64-windows-8f55ca2/installed/x64-windows/include/../bin
1> [CMake] -- Found OpenSSL: C:/Users/Joerg/source/repos/JoergAtGithub/mixxx/buildenv/mixxx-deps-2.3-x64-windows-8f55ca2/installed/x64-windows/debug/lib/libcrypto.lib (found version "1.1.1j")  
1> [CMake] -- Looking for __GNU_LIBRARY__
1> [CMake] -- Looking for __GNU_LIBRARY__ - not found

The path C:/Users/Joerg/source/repos/JoergAtGithub/mixxx/buildenv/mixxx-deps-2.3-x64-windows-8f55ca2/installed/x64-windows/include/../bin exists, but in it are the release librarys. The Debug librarys are in C:/Users/Joerg/source/repos/JoergAtGithub/mixxx/buildenv/mixxx-deps-2.3-x64-windows-8f55ca2/installed/x64-windows/include/../debug/bin

@daschuer
Copy link
Member Author

I wonder why there are not two lines one for release and one for debug.

I have added an additional these lines message for debug in:
overlay/ports/pthreads/vcpkg-cmake-wrapper.cmake
https://github.com/mixxxdj/vcpkg/blob/4fc035e0d408f62cc5a3437e79feb14d05e3e4c0/overlay/ports/pthreads/vcpkg-cmake-wrapper.cmake#L77

But since it is not there, I assume you have the old file somehow. A caching issue?
Maybe you need to start over with a clan build

@daschuer
Copy link
Member Author

I have just confirmed that the version in /mixxx-deps-2.3-x64-windows-8f55ca2/installed/x64-windows/share/pthreads/vcpkg-cmake-wrapper.cmake is old :-(

@daschuer
Copy link
Member Author

Please try to manual replace:
*installed/x64-windows/share/pthread/vcpkg-cmake-wrapper.cmake
*installed/x64-windows/share/pthreads/vcpkg-cmake-wrapper.cmake
*installed/x64-windows/share/pthreads/vcpkg-cmake-wrapper.cmake
*installed/x64-windows/share/pthreads_windows/
with
https://raw.githubusercontent.com/mixxxdj/vcpkg/4fc035e0d408f62cc5a3437e79feb14d05e3e4c0/overlay/ports/pthreads/vcpkg-cmake-wrapper.cmake

@daschuer
Copy link
Member Author

daschuer commented Jun 18, 2021

I think it was a caching issue. I have now bumped the pthreads port version. Let's have a look.

@daschuer
Copy link
Member Author

Rebased, the final version. please verify.

@JoergAtGithub
Copy link
Member

Verified!!!
Now it works with Debug x64__off and RelWithDebInfo x64__portable !

Thank you!

@daschuer
Copy link
Member Author

How is the performance of Mixxx compared to RelWithDebInfo?
Minimum buffer size with keylock enabled / GUI Lags / DB Lags / Waveforms?
I am asking because if we can make Debug default for developers?

@daschuer
Copy link
Member Author

This is the upstream PR: microsoft#18528

But lets merge this as an overlay and not merge from master to not change anything else just before the release.

@Holzhaus, Do you agree?

@Holzhaus
Copy link
Member

OK for me.

@Holzhaus Holzhaus merged commit 049b5ad into mixxxdj:2.3 Jun 19, 2021
@Holzhaus
Copy link
Member

Thank you.

@daschuer daschuer deleted the pthreads_linkage branch January 5, 2023 07:35
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.

3 participants