averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #39556 from DougGregor/back-deploy-concurrency-memory-exclusivity

Browse Source 
Always use the same TLS context as the runtime for back-deployed concurrency
This commit is contained in:
Doug Gregor
2021-10-02 11:54:45 -07:00
committed by GitHub
parent c2a79393d3 2747285417
commit 20f9affbe0
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
stdlib/public/BackDeployConcurrency/Exclusivity.cpp
View File

@@ -15,21 +15,35 @@
//===----------------------------------------------------------------------===//
#include <cinttypes>
#include "swift/Basic/Lazy.h"
#include "swift/Runtime/Exclusivity.h"
#include "swift/Runtime/ThreadLocalStorage.h"
#include "../runtime/ExclusivityPrivate.h"
#include "../runtime/SwiftTLSContext.h"
using namespace swift;
using namespace swift::runtime;
// Thread-local storage used by the back-deployed concurrency library.
namespace {
SwiftTLSContext &SwiftTLSContext::get() {
SwiftTLSContext *ctx = static_cast<SwiftTLSContext *>(
SWIFT_THREAD_GETSPECIFIC(SWIFT_RUNTIME_TLS_KEY));
if (ctx)
return *ctx;
static thread_local SwiftTLSContext TLSContext;
static OnceToken_t setupToken;
SWIFT_ONCE_F(
setupToken,
[](void *) {
pthread_key_init_np(SWIFT_RUNTIME_TLS_KEY, [](void *pointer) {
delete static_cast<SwiftTLSContext *>(pointer);
});
},
nullptr);
} // anonymous namespace
SwiftTLSContext &SwiftTLSContext::get() { return TLSContext; }
ctx = new SwiftTLSContext();
SWIFT_THREAD_SETSPECIFIC(SWIFT_RUNTIME_TLS_KEY, ctx);
return *ctx;
}
// Bring in the concurrency-specific exclusivity code.
#include "../runtime/ConcurrencyExclusivity.inc"

2
test/Concurrency/Runtime/exclusivity.swift
View File

@@ -3,8 +3,6 @@
// REQUIRES: executable_test
// REQUIRES: concurrency
// rdar://76038845
// REQUIRES: rdar83064974
// REQUIRES: concurrency_runtime
// UNSUPPORTED: back_deployment_runtime