[Concurrency] repair cooperative executor and its tests #39365
Merged
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
This patch repairs the build failure for cooperative executor. And also fixed main executor to avoid assertion failure due to `witnessTable == nullptr`
Some headers switch their inline implementations based on SWIFT_STDLIB_SINGLE_THREAD_RUNTIME definition. This fixes linking failure while building runtime unittests
|
preset=buildbot_incremental_linux_crosscompile_wasm |
|
@swift-ci please smoke test |
DougGregor
approved these changes
Sep 21, 2021
| ExecutorRef swift::swift_task_getMainExecutor() { | ||
| #if SWIFT_CONCURRENCY_COOPERATIVE_GLOBAL_EXECUTOR | ||
| return ExecutorRef::forOrdinary(&_swift_mainExecutorIdentity, nullptr); | ||
| return ExecutorRef::generic(); |
There was a problem hiding this comment.
This is interesting. In the cooperative case, does@MainActor not really have its own executor, because all executors are the same? Or is it that we should have a main-actor actor and dispatching to it goes in through the same run loop? I think I agree that this is the right approach.
There was a problem hiding this comment.
Good point. I respected the former from my understanding, but I'm not confident here.
Some of test cases assumes that the runtime is built for multi-threaded platform.
kateinoigakukun
force-pushed
the
katei/fix-coop-executor-part-2
branch
from
779ad22 to
0b70235
Compare
|
@swift-ci please smoke test |
This comment has been minimized.
This comment has been minimized.
|
The failing test seems unrelated to this change 👀 |
This comment has been minimized.
This comment has been minimized.
4 similar comments
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
@swift-ci please test Windows platform |
ktoso
approved these changes
Sep 27, 2021
8 tasks
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.
This patch repairs the main executor to avoid assertion failure due to
witnessTable == nullptrintroduced by my previous patch 😓 #39092And fixes and disables some tests that depend on multi-thread based executor implementation detail.
This also fixes CI failure on WebAssembly CI: https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-20.04-webassembly/10/console