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

[Client] [WSL] Extend detection. #2568

Merged
merged 4 commits into from
Jun 27, 2018

Conversation

AenBleidd
Copy link
Member

Move WSL detection to get_host_info().
Enumerate available WSLs from registry.
Add wslapi library loading.
Add support of multiple installed wsl distros detection.
Detect only installed and configured distros.
Add extra information parse.
Add wslinfo files to save and parse wsl info.
Add dont_use_wsl param to cc_config.
Add missed hostinfo_wsl.cpp when building win client using gcc.
Fix small issues.
Small refactoring.

Signed-off-by: Vitalii Koshura lestat.de.lionkur@gmail.com

Move WSL detection to get_host_info().
Enumerate available WSLs from registry.
Add wslapi library loading.
Add support of multiple installed wsl distros detection.
Detect only installed and configured distros.
Add extra information parse.
Add wslinfo files to save and parse wsl info.
Add dont_use_wsl param to cc_config.
Add missed hostinfo_wsl.cpp when building win client using gcc.
Fix small issues.
Small refactoring.

Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>
Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>
Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>
@AenBleidd
Copy link
Member Author

@davidpanderson, @ChristianBeer, @RichardHaselgrove, @JuhaSointusalo, @TheAspens
Guys, I encourage you to review this. I understand, that this is quite a big piece of code. But there was no way for me to make it less without losing some functionality :)

@JuhaSointusalo
Copy link
Contributor

It seems that you are setting XML tag name from distro name. That's interesting idea but possibly bad one if you ever want to process the XML with something other than BOINC's XML parser. I would have the distro name in it's own element, say distro_name, and a constant name for the enclosing element, like distro or something.

@AenBleidd
Copy link
Member Author

@JuhaSointusalo, ok, I'll fix this

Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>
@AenBleidd
Copy link
Member Author

Fixed

@davidpanderson
Copy link
Contributor

This all looks fine to me, though I'm unable to test it.

@AenBleidd
Copy link
Member Author

wslconfig output:
image
boinc output:
image
client_state.xml:
image

@davidpanderson
Copy link
Contributor

Looks good. I'll merge. Thanks for doing this.

@davidpanderson davidpanderson merged commit f14d96d into BOINC:master Jun 27, 2018
@AenBleidd AenBleidd deleted the wsl_part2_for_pr branch June 27, 2018 06:14
@RichardHaselgrove
Copy link
Contributor

RichardHaselgrove commented Jun 27, 2018

Now we have a merged version, I was able to build a test version (VS 2013) and try it. No errors, and

27/06/2018 17:17:04 |  | WSL detected:
27/06/2018 17:17:04 |  | [Ubuntu] (default): Linux Ubuntu (Ubuntu 16.04.4 LTS [4.4.0-17134-Microsoft])

Unfortunately, I think GPUGrid have (temporarily?) abandoned their attempts to get Quantum Chemistry running under WSL, so full testing will have to wait. But good so far.

And under Windows 7, it simply says
27/06/2018 17:35:07 | | No WSL found.
I think that's good enough.

@RichardHaselgrove
Copy link
Contributor

RichardHaselgrove commented Jun 29, 2018

@AenBleidd: small bug

Running the WSL-enabled client under Windows 7, so no WSL available and none detected - all good.

Client writes extra line into cc_config.xml
<dont_use_wsl>0</dont_use_wsl>
but on reading config files after setting Event Log options or from menu, Event Log reports
29/06/2018 15:59:47 | | Unrecognized tag in cc_config.xml: <dont_use_wsl>

Patch in #2581

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.

4 participants