Skip to content

[stdlib] Export ActiveTask symbol #91067

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.

Sign up for GitHub

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

Open
felipepiovezan wants to merge 1 commit into
base: main
Choose a base branch
from
+27 −16
Open

[stdlib] Export ActiveTask symbol #91067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 21 additions & 11 deletions stdlib/public/Concurrency/Actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,24 @@ static bool shouldYieldThread() {
/******************************* TASK TRACKING ******************************/
/*****************************************************************************/

/// The currently executing task. If this has thread-local storage (Windows,
/// Linux) or is a plain global (embedded), give it a stable name and protected
/// visibility, enabling debuggers to locate the symbol by name and ensuring it
/// survives stripping the symbol table.
/// Bump _concurrency_current_task_storage_kind in Debug.h if this changes.
#ifdef SWIFT_THREAD_LOCAL
extern "C" {
// (windows) dllexport is not allowed on thread-local variables.
#if defined(__ELF__)
SWIFT_ATTRIBUTE_FOR_EXPORTS
#endif
#else
namespace {
#endif
SWIFT_THREAD_LOCAL_TYPE(TLSPointer<AsyncTask>, tls_key::concurrency_task)
_swift_concurrency_currentTask;
}

namespace {

/// A class which encapsulates the information we track about
Expand Down Expand Up @@ -191,23 +209,15 @@ class ExecutorTrackingInfo {
};

class ActiveTask {
/// A thread-local variable pointing to the active tracking
/// information about the current thread, if any.
static SWIFT_THREAD_LOCAL_TYPE(TLSPointer<AsyncTask>,
tls_key::concurrency_task) Value;

public:
static void set(AsyncTask *task) { Value.set(task); }
static AsyncTask *get() { return Value.get(); }
static void set(AsyncTask *task) { _swift_concurrency_currentTask.set(task); }
static AsyncTask *get() { return _swift_concurrency_currentTask.get(); }
static AsyncTask *swap(AsyncTask *newTask) {
return Value.swap(newTask);
return _swift_concurrency_currentTask.swap(newTask);
}
};

/// Define the thread-locals.
SWIFT_THREAD_LOCAL_TYPE(TLSPointer<AsyncTask>, tls_key::concurrency_task)
ActiveTask::Value;

SWIFT_THREAD_LOCAL_TYPE(TLSPointer<ExecutorTrackingInfo>,
tls_key::concurrency_executor_tracking_info)
ExecutorTrackingInfo::ActiveInfoInThread;
Expand Down
11 changes: 6 additions & 5 deletions stdlib/public/Concurrency/Debug.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,14 @@ bool _swift_concurrency_debug_supportsPriorityEscalation;
/// new value; bump _swift_concurrency_debug_internal_layout_version when
/// adding one.
enum class _concurrency_current_task_storage_kind : uint8_t {
/// The task pointer lives in TLS at offset 0 of the runtime's internal
/// current-task variable, which the debugger locates via debug info.
/// The task pointer lives in TLS at offset 0 of the runtime's exported
/// current-task variable, `_swift_concurrency_currentTask`.
cxx_thread_local = 1,

/// The task pointer lives at offset 0 of the runtime's internal current-task
/// variable (no TLS resolution). Used by single-threaded /
/// SWIFT_THREADING_NONE builds where `SWIFT_THREAD_LOCAL` expands to nothing.
/// The task pointer lives at offset 0 of the runtime's current-task variable,
/// `_swift_concurrency_currentTask` (no TLS resolution). Used by
/// single-threaded / SWIFT_THREADING_NONE builds where `SWIFT_THREAD_LOCAL`
/// expands to nothing.
global = 2,

/// Pthread thread-specific data with a *reserved* (compile-time constant)
Expand Down