SR-10611: ProcessInfo.activeProcessorCount too high in containerised Linux #2215
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…Linux - On Linux, use sched_getaffinity() falling back to sysconf(_SC_NPROCESSORS_ONLN) as this should provide a better value for ProcessInfo.activeProcessorCount when running under cgroups (eg Docker).
|
cc @ianpartridge Does this seem reasonable when running under Docker? The solutions used in other languages mentioned in https://bugs.swift.org/browse/SR-10611?filter=10905 seem to use this method. |
|
@swift-ci test |
|
@swift-ci please test |
compnerd
reviewed
May 6, 2019
| @@ -451,6 +454,14 @@ CF_PRIVATE CFIndex __CFActiveProcessorCount() { | |||
| pcnt = 0; | |||
| } | |||
| #elif DEPLOYMENT_TARGET_LINUX | |||
|
|
|||
| #ifdef _SCHED_H | |||
There was a problem hiding this comment.
Please use cmake for this:
include(CheckSymbolExists)
include(CheckIncludeFile)
check_include_file("sched.h" HAVE_SCHED_H)
check_symbol_exists(sched_getaffinity "sched.h" HAVE_SCHED_GETAFFINITY)
|
@swift-ci test |
1 similar comment
|
@swift-ci test |
compnerd
approved these changes
May 7, 2019
CoreFoundation/CMakeLists.txt
Outdated
| if(HAVE_SCHED_GETAFFINITY) | ||
| target_compile_definitions(CoreFoundation | ||
| PRIVATE | ||
| -DHAVE_SCHED_GETAFFINITY) |
There was a problem hiding this comment.
A level of indentation would be nice.
|
@swift-ci test and merge |
1 similar comment
|
@swift-ci test and merge |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
sysconf(_SC_NPROCESSORS_ONLN) as this should provide a better
value for ProcessInfo.activeProcessorCount when running under
cgroups (eg Docker).
Not sure if this is the best solution and will need an offline test in a Docker environment.